X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2Fds390%2FMakefile.in;h=135dce7286c879b3e6badaaa06a61a4d97a8a930;hb=80972b2e54c9b88f11c27b878874fd2a6a681391;hp=d1dd7814c89785ab2d4608f0b1b92f4c6ee35a6c;hpb=b371818d595946a9c9d6e6e36e16635d92891543;p=fw%2Fsdcc

diff --git a/device/lib/ds390/Makefile.in b/device/lib/ds390/Makefile.in
old mode 100755
new mode 100644
index d1dd7814..135dce72
--- a/device/lib/ds390/Makefile.in
+++ b/device/lib/ds390/Makefile.in
@@ -1,8 +1,13 @@
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE        = @LIB_TYPE@
 
 CC = ../../../bin/sdcc
 
+PORTDIR = ../build/ds390
+
 #VERBOSE = --verbose
 
 OBJECTS = tinibios.rel memcpyx.rel  lcd390.rel i2c390.rel rtc390.rel putchar.rel
@@ -10,9 +15,9 @@ OBJECTS = tinibios.rel memcpyx.rel  lcd390.rel i2c390.rel rtc390.rel putchar.rel
 SOURCES = $(patsubst %.rel,%.c,$(OBJECTS))
 
 CPPFLAGS = -I$(srcdir)/../../include
-CFLAGS = -mds390 $(CPPFLAGS) $(VERBOSE) --std-c89
+CFLAGS = -mds390 $(CPPFLAGS) $(VERBOSE) --std-c99
 
-all: $(OBJECTS) libds390.lib
+all: $(OBJECTS) $(PORTDIR)/libds390.lib
 
 clean:
 	rm -f *.lst *.rel *.sym *.cdb *.asm \#* *~ *.rst *.hex
@@ -21,11 +26,20 @@ clean:
 distclean: clean
 	rm -f Makefile Makefile.dep
 
-libds390.lib: $(OBJECTS)
+$(PORTDIR)/libds390.lib: $(OBJECTS)
+ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	for libfile in $(OBJECTS); do \
-		echo $$libfile >>$@; \
-	done;
+	../../../bin/sdcclib -a $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+	ar -Scq $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+	ar -Scq $@ $(OBJECTS)
+	$(top_builddir)/bin/asranlib $@
+else
+	rm -f $@;
+	for libfile in $(basename $(OBJECTS)); do echo $$libfile >>$@; done
+	cp $(OBJECTS) $(PORTDIR)
+endif
 
 %.rel: %.c
 	$(CC) -c $(CFLAGS) $<
@@ -43,5 +57,5 @@ Makefile.dep: $(SOURCES)
 	done
 
 ifeq "$(findstring $(MAKECMDGOALS),clean distclean)" ""
-  include Makefile.dep
+  -include Makefile.dep
 endif