X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2FMakefile.in;h=317863ea45f75c09f37edd208d1d6ca2d6bde1a3;hb=f1c40004ae349f7cd3a1a5c5c85f62f695196370;hp=7c28242bdceab319260914a0e00410576f0c2ec3;hpb=8fca63fbcde6e36936906190fa8e41f072a69e34;p=fw%2Fsdcc

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 7c28242b..317863ea 100644
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -23,7 +23,6 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
-sdcc_datadir    = @sdcc_datadir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -31,15 +30,19 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
+lib_dir_suffix  = @lib_dir_suffix@
+
+sdcc_libdir     = $(DESTDIR)$(datadir)/$(lib_dir_suffix)
+
 CPPFLAGS        = -I$(INCDIR)
-CFLAGS		= $(MODELFLAGS) --nostdinc --nostdlib
+CFLAGS		= $(MODELFLAGS) --nostdinc
 
 BUILDDIR        = build
 # Default
 PORT            = z80
 PORTDIR         = $(BUILDDIR)/$(PORT)
 
-SOURCES		= _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
+SOURCES		= _atof.c _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
 		  _decdptr.c _divsint.c _divslong.c _divuint.c \
 		  _divulong.c _fs2schar.c _fs2sint.c _fs2slong.c \
 		  _fs2uchar.c _fs2uint.c _fs2ulong.c _fsadd.c \
@@ -47,29 +50,32 @@ SOURCES		= _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
 		  _fsneq.c _fssub.c _gptrget.c _gptrgetc.c _gptrput.c \
 		  _sint2fs.c _iscntrl.c _isdigit.c _isgraph.c \
 		  _islower.c _isprint.c _ispunct.c _isspace.c \
-		  _isupper.c _isxdigit.c _slong2fs.c _memcmp.c \
-		  _memcpy.c _memset.c _modsint.c _modslong.c \
+		  _isupper.c _isxdigit.c _itoa.c _ltoa.c \
+                  _slong2fs.c _memcmp.c \
+		  _memcpy.c _memmove.c _memset.c _modsint.c _modslong.c \
 		  _moduint.c _modulong.c _mulint.c _mullong.c \
 		  _ser.c _setjmp.c \
 		  _spx.c _startup.c _strchr.c _strcmp.c _strcpy.c \
 		  _strcspn.c _strlen.c _strncat.c _strncmp.c \
 		  _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-		  _strstr.c _strtok.c _uchar2fs.c _uint2fs.c \
-		  _ulong2fs.c malloc.c serial.c ser_ir.c printfl.c \
+		  _strstr.c _strtok.c \
+		  _uchar2fs.c _uint2fs.c _ulong2fs.c \
+		  calloc.c malloc.c realloc.c free.c \
+		  serial.c ser_ir.c printfl.c \
 		  printf_large.c vprintf.c puts.c gets.c \
 		  assert.c _strcat.c time.c printf_fast.c bpx.c \
 		  fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
 		  cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
 		  asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
-		  sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c
+		  sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
 
 OBJECTS		= $(patsubst %.c,$(PORTDIR)/%.rel,$(SOURCES))
 
-Z80SOURCES      = _atoi.c \
+Z80SOURCES      = _atof.c _atoi.c \
 		  _iscntrl.c _isdigit.c _isgraph.c \
 		  _islower.c _isprint.c _ispunct.c _isspace.c \
 		  _isupper.c _isxdigit.c _memcmp.c \
-		  _memcpy.c _memset.c \
+		  _memcpy.c _memmove.c _memset.c \
 		  _startup.c _strchr.c _strcmp.c _strcpy.c \
 		  _strcspn.c _strlen.c _strncat.c _strncmp.c \
 		  _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
@@ -79,26 +85,81 @@ Z80SOURCES      = _atoi.c \
 		  _modslong.c _modulong.c \
 		  _mullong.c \
 		  _divslong.c _divulong.c \
-		  malloc.c \
+		  calloc.c malloc.c realloc.c free.c \
 		  _fs2schar.c _fs2sint.c _fs2slong.c \
 		  _fs2uchar.c _fs2uint.c _fs2ulong.c _fsadd.c \
 		  _fsdiv.c _fseq.c _fsgt.c _fslt.c _fsmul.c \
 		  _fsneq.c _fssub.c \
 		  _uchar2fs.c _uint2fs.c \
 		  _ulong2fs.c \
-		  _slong2fs.c _sint2fs.c _schar2fs.c 
+		  _slong2fs.c _sint2fs.c _schar2fs.c
 
 Z80OBJECTS      = $(Z80SOURCES:%.c=$(PORTDIR)/%.o)
 
+XA51SOURCES      = _atof.c _atoi.c _atol.c _schar2fs.c \
+		  _divsint.c _divslong.c _divuint.c \
+		  _divulong.c _fs2schar.c _fs2sint.c _fs2slong.c \
+		  _fs2uchar.c _fs2uint.c _fs2ulong.c _fsadd.c \
+		  _fsdiv.c _fseq.c _fsgt.c _fslt.c _fsmul.c \
+		  _fsneq.c _fssub.c \
+		  _sint2fs.c _iscntrl.c _isdigit.c _isgraph.c \
+		  _islower.c _isprint.c _ispunct.c _isspace.c \
+		  _isupper.c _isxdigit.c _slong2fs.c _memcmp.c \
+		  _memcpy.c _memmove.c _memset.c _modsint.c _modslong.c \
+		  _moduint.c _modulong.c _mulint.c _mullong.c \
+		  _strchr.c _strcmp.c _strcpy.c \
+		  _strcspn.c _strlen.c _strncat.c _strncmp.c \
+		  _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
+		  _strstr.c _strtok.c \
+		  _uchar2fs.c _uint2fs.c _ulong2fs.c \
+		  calloc.c malloc.c realloc.c free.c \
+		  puts.c gets.c \
+		  printf_large.c puts.c gets.c \
+		  assert.c _strcat.c time.c \
+		  fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
+		  cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
+		  asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
+		  sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
+
+XA51OBJECTS      = $(XA51SOURCES:%.c=$(PORTDIR)/%.rel)
+
+HC08SOURCES	= _atof.c _atoi.c _atol.c _schar2fs.c \
+		  _divsint.c _divslong.c \
+		  _fs2schar.c _fs2sint.c _fs2slong.c \
+		  _fs2uchar.c _fs2uint.c _fs2ulong.c _fsadd.c \
+		  _fsdiv.c _fseq.c _fsgt.c _fslt.c _fsmul.c \
+		  _fsneq.c _fssub.c \
+		  _sint2fs.c _iscntrl.c _isdigit.c _isgraph.c \
+		  _islower.c _isprint.c _ispunct.c _isspace.c \
+		  _isupper.c _isxdigit.c _itoa.c _ltoa.c \
+                  _slong2fs.c _memcmp.c \
+		  _memcpy.c _memmove.c _memset.c _modsint.c _modslong.c \
+		  _moduint.c _modulong.c \
+		  _spx.c _startup.c _strchr.c _strcmp.c _strcpy.c \
+		  _strcspn.c _strlen.c _strncat.c _strncmp.c \
+		  _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
+		  _strstr.c _strtok.c \
+		  _uchar2fs.c _uint2fs.c _ulong2fs.c \
+		  calloc.c malloc.c realloc.c free.c \
+		  assert.c _strcat.c time.c \
+		  fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
+		  cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
+		  asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
+		  sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
+
+HC08OBJECTS	= $(patsubst %.c,$(PORTDIR)/%.rel,$(HC08SOURCES))
+
 OEXT            = .rel
 
 include incl.mk
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf models model-ds390 model-z80 model-gbz80
+all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08
 
-objects: build-dir $(OBJECTS) port-specific-objects lib-files
+# model-pic16
+
+objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate
 
 models:
 	if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
@@ -112,6 +173,19 @@ model-ds390:
 	  $(MAKE) MODELFLAGS="-mds390" PORT=ds390 objects; \
 	fi
 
+model-ds400:
+	if [ "`grep ds400 ../../ports.build`" = ds400 ]; then \
+	  $(MAKE) MODELFLAGS="-mds400" PORT=ds400 objects; \
+	fi
+
+model-xa51:
+	if [ "`grep xa51 ../../ports.build`" = xa51 ]; then \
+	  $(MAKE) MODELFLAGS="-mxa51" PORT=xa51 objects-xa51; \
+	fi
+
+objects-xa51: build-dir $(XA51OBJECTS) port-specific-objects
+	cd $(PORTDIR); ls *$(OEXT) > lib$(PORT).lib
+
 model-z80:
 	if [ "`grep z80 ../../ports.build`" = z80 ]; then \
 	  $(MAKE) MODELFLAGS="-mz80" PORT=z80 objects-z80 OEXT=.o; \
@@ -122,9 +196,26 @@ model-gbz80:
 	  $(MAKE) MODELFLAGS="-mgbz80" PORT=gbz80 objects-z80 OEXT=.o; \
 	fi
 
-objects-z80: build-dir $(Z80OBJECTS) port-specific-objects
+objects-z80: build-dir $(Z80OBJECTS) port-specific-objects clean_intermediate
 	cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
 
+model-hc08:
+	if [ "`grep hc08 ../../ports.build`" = hc08 ]; then \
+	  $(MAKE) MODELFLAGS="-mhc08" PORT=hc08 objects-hc08; \
+	fi
+
+objects-hc08: build-dir $(HC08OBJECTS) port-specific-objects clean_intermediate
+	cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
+
+model-pic16:
+	if [ "`grep pic16 ../../ports.build`" = pic16 ]; then \
+	  $(MAKE) MODELFLAGS="-mpic16" PORT=pic16 OEXT=.lib objects-pic16; \
+	  fi
+
+objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16
+	cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
+
+
 build-dir: $(PORTDIR)
 
 $(PORTDIR):
@@ -136,26 +227,32 @@ port-specific-objects:
 	  cp -f $(PORT)/*.lib $(PORT)/*$(OEXT) $(PORTDIR); \
 	fi
 
+port-specific-objects-pic16:
+	if [ -d $(PORT) ]; then \
+	  $(MAKE) -C $(PORT); \
+	  cp -f $(PORT)/bin/* $(PORTDIR); \
+	fi
+
 lib-files:
 	cp *.lib $(PORTDIR)
 
+clean_intermediate:
+	rm -f $(PORTDIR)/*.lst $(PORTDIR)/*.sym
+
+clean_intermediate-pic16:
+	$(MAKE) -C $(PORT) clean-intermediate
+
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	cp -r $(BUILDDIR)/* $(sdcc_datadir)/lib
-	cp -r ds390 gbz80 z80 *.c $(sdcc_datadir)/lib/src
-	rm `find $(sdcc_datadir)/lib/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm'`
+	cp -r -u $(BUILDDIR)/* $(sdcc_libdir)
+	cp -r -u ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
+	rm -r `find $(sdcc_libdir)/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm' -or -name 'CVS'`
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	for hdr in ../include/*.h; do rm -f $(sdcc_datadir)/include/$$hdr; done
-	for cfl in *.c; do rm -f $(sdcc_datadir)/lib/$$cfl; done
-	for model in $(MODELS); do \
-	  rm -rf $(sdcc_datadir)/lib/$$model; \
-	done
-	rm -rf $(sdcc_datadir)/lib/ds390
-
+	rm -rf $(sdcc_libdir)
 
 # Performing self-test
 # --------------------
@@ -170,13 +267,16 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-	[ -d $(sdcc_datadir)/lib ] || mkdir -p $(sdcc_datadir)/lib
+	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
 	for model in $(MODELS); do \
-	 [ -d $(sdcc_datadir)/lib/$$model ] || \
-	 mkdir -p $(sdcc_datadir)/lib/$$model; \
+	 [ -d $(sdcc_libdir)/$$model ] || \
+	 mkdir -p $(sdcc_libdir)/$$model; \
 	done
-	[ -d $(sdcc_datadir)/lib/ds390 ] || mkdir -p $(sdcc_datadir)/lib/ds390
-	mkdir -p $(sdcc_datadir)/lib/src
+	[ -d $(sdcc_libdir)/ds390 ] || mkdir -p $(sdcc_libdir)/ds390
+	[ -d $(sdcc_libdir)/ds400 ] || mkdir -p $(sdcc_libdir)/ds400
+	[ -d $(sdcc_libdir)/hc08 ] || mkdir -p $(sdcc_libdir)/hc08
+	[ -f $(sdcc_libdir)/pic16 ] || mkdir -p $(sdcc_libdir)/pic16
+	mkdir -p $(sdcc_libdir)/src
 
 # Creating dependencies
 # ---------------------
@@ -185,7 +285,7 @@ dep: Makefile.dep
 Makefile.dep: $(SOURCES) $(INCDIR)/*.h
 	rm -f Makefile.dep
 	for i in $(SOURCES); do \
-	  $(CPP) -lang-c++ -M $(CPPFLAGS) $$i >$${i}.dep; \
+	  $(CPP) -std=c99 -M $(CPPFLAGS) $$i >$${i}.dep; \
 	  cat $${i}.dep >>Makefile.dep; \
 	  rm $${i}.dep; \
 	done
@@ -199,9 +299,7 @@ include clean.mk
 .SUFFIXES: .rel .o
 
 $(PORTDIR)/%$(OEXT): %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-	mv -f `basename $@` $@
-	mv -f `basename $@ $(OEXT)`.asm $(PORTDIR)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 # Remaking configuration
 # ----------------------