X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=blobdiff_plain;f=device%2Flib%2FMakefile.in;h=70b3a6dd9ba8d3f75cc01eee17fd9fad8eb23902;hp=8e91993490f4d070746af1b736d9f35acde8b96e;hb=5253e14d8671e6fbb7cfacf2ec152edb3d9c11f0;hpb=871e6c6aefc06309a03c295ce0d3c9d4bbb4a742 diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 8e919934..70b3a6dd 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -7,28 +7,30 @@ VERSIONHI = @VERSIONHI@ VERSIONLO = @VERSIONLO@ VERSIONP = @VERSIONP@ -SHELL = /bin/sh -CPP = @CPP@ -INSTALL = @INSTALL@ +SHELL = /bin/sh +CPP = @CPP@ +INSTALL = @INSTALL@ CP = @CP@ +LIB_TYPE = @LIB_TYPE@ + ifeq ($(shell uname -s),Linux) -CP_U = $(CP) -u +CP_U = $(CP) -u else -CP_U = $(CP) +CP_U = $(CP) endif -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ srcdir = @srcdir@ -INCDIR = $(top_srcdir)/device/include +INCDIR = $(top_srcdir)/device/include ifndef PORTINCDIR -PORTINCDIR = $(INCDIR)/mcs51 +PORTINCDIR = $(INCDIR)/mcs51 endif -CC = $(top_builddir)/bin/sdcc -CPP = $(top_builddir)/bin/sdcpp +CC = $(top_builddir)/bin/sdcc +CPP = $(top_builddir)/bin/sdcpp prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -47,13 +49,13 @@ lib_dir_suffix = @lib_dir_suffix@ sdcc_libdir = $(DESTDIR)$(datadir)/$(lib_dir_suffix) CPPFLAGS = -I$(INCDIR) -I$(PORTINCDIR) -CFLAGS = $(MODELFLAGS) --nostdinc --std-c99 +CFLAGS = $(MODELFLAGS) --nostdinc --std-c99 BUILDDIR = build # Default PORT = z80 ifndef PORTDIR -PORTDIR = $(BUILDDIR)/$(PORT) +PORTDIR = $(abspath $(BUILDDIR)/$(PORT)) endif OPT_DISABLE_AVR = @OPT_DISABLE_AVR@ @@ -67,131 +69,91 @@ OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@ OPT_DISABLE_XA51 = @OPT_DISABLE_XA51@ OPT_DISABLE_Z80 = @OPT_DISABLE_Z80@ -SOURCES = _autobaud.c _bp.c _decdptr.c \ - _gptrget.c _gptrgetc.c _gptrput.c \ - _ser.c _setjmp.c \ - serial.c ser_ir.c \ - _atof.c _atoi.c _atol.c _itoa.c _ltoa.c \ - _schar2fs.c _sint2fs.c _slong2fs.c \ - _uchar2fs.c _uint2fs.c _ulong2fs.c \ - _fs2schar.c _fs2sint.c _fs2slong.c \ - _fs2uchar.c _fs2uint.c _fs2ulong.c \ - _fsadd.c _fsdiv.c _fsmul.c _fssub.c \ - _fseq.c _fsgt.c _fslt.c _fsneq.c \ - _divsint.c _divslong.c _divuint.c _divulong.c \ - _modsint.c _modslong.c _moduint.c _modulong.c \ - _mulint.c _mullong.c \ - abs.c labs.c rand.c \ - _iscntrl.c _isdigit.c _isgraph.c \ - _isprint.c _ispunct.c _isspace.c \ - _islower.c _isupper.c _isxdigit.c \ - _spx.c _startup.c \ - _strcat.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 \ - _memcmp.c _memcpy.c _memmove.c _memset.c \ - _heap.c _calloc.c _malloc.c _realloc.c _free.c \ - printf_large.c sprintf.c vprintf.c puts.c gets.c \ - printf_fast.c printf_fast_f.c printf_tiny.c printfl.c \ - assert.c time.c bpx.c \ - _fscmp.c _fsget1arg.c _fsget2args.c _fsnormalize.c \ - _fsreturnval.c _fsrshift.c _fsswapargs.c _logexpf.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 - -OBJECTS = $(patsubst %.c,$(PORTDIR)/%.rel,$(SOURCES)) - -Z80SOURCES = \ - _atof.c _atoi.c _atol.c _itoa.c _ltoa.c \ - _schar2fs.c _sint2fs.c _slong2fs.c \ - _uchar2fs.c _uint2fs.c _ulong2fs.c \ - _fs2schar.c _fs2sint.c _fs2slong.c \ - _fs2uchar.c _fs2uint.c _fs2ulong.c \ - _fsadd.c _fsdiv.c _fsmul.c _fssub.c \ - _fseq.c _fsgt.c _fslt.c _fsneq.c \ - _divslong.c _divulong.c \ - _modslong.c _modulong.c \ - _mullong.c \ - abs.c labs.c rand.c \ - _iscntrl.c _isdigit.c _isgraph.c \ - _isprint.c _ispunct.c _isspace.c \ - _islower.c _isupper.c _isxdigit.c \ - _startup.c \ - _strcat.c _strchr.c _strcmp.c _strcpy.c \ - _strcspn.c _strncat.c _strncmp.c \ - _strncpy.c _strpbrk.c _strrchr.c _strspn.c \ - _strstr.c _strtok.c \ - _memcmp.c _memcpy.c _memset.c \ - _calloc.c _malloc.c _realloc.c _free.c \ - printf_large.c sprintf.c vprintf.c puts.c gets.c \ - assert.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 - -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 \ - abs.c labs.c rand.c \ - _strcat.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 \ - _heap.c _calloc.c _malloc.c _realloc.c _free.c \ - puts.c gets.c \ - printf_large.c puts.c gets.c \ - assert.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 _itoa.c _ltoa.c \ - _schar2fs.c _sint2fs.c _slong2fs.c \ - _uchar2fs.c _uint2fs.c _ulong2fs.c \ - _fs2schar.c _fs2sint.c _fs2slong.c \ - _fs2uchar.c _fs2uint.c _fs2ulong.c \ - _fsadd.c _fsdiv.c _fsmul.c _fssub.c \ - _fseq.c _fsgt.c _fslt.c _fsneq.c \ - _divsint.c _divslong.c \ - _modsint.c _modslong.c _moduint.c _modulong.c \ - abs.c labs.c rand.c \ - _iscntrl.c _isdigit.c _isgraph.c \ - _isprint.c _ispunct.c _isspace.c \ - _islower.c _isupper.c _isxdigit.c \ - _spx.c _startup.c \ - _strcat.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 \ - _memcmp.c _memcpy.c _memmove.c _memset.c \ - _heap.c _calloc.c _malloc.c _realloc.c _free.c \ - printf_large.c sprintf.c vprintf.c puts.c gets.c \ - assert.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)) +SOURCES_FLOAT = $(COMMON_FLOAT) \ + _fscmp.c \ + _fsget1arg.c \ + _fsget2args.c \ + _fsnormalize.c \ + _fsreturnval.c \ + _fsrshift.c \ + _fsswapargs.c \ + _logexpf.c + +SOURCES_INT = $(COMMON_INT) \ + _divsint.c \ + _divuint.c \ + _modsint.c \ + _moduint.c \ + _mulint.c + +SOURCES_LONG = $(COMMON_LONG) \ + _divulong.c \ + _mullong.c + +SOURCES_SDCC = $(COMMON_SDCC) \ + _autobaud.c \ + _bp.c \ + _decdptr.c \ + _gptrget.c \ + _gptrgetc.c \ + _gptrput.c \ + _ser.c \ + _setjmp.c \ + serial.c \ + _itoa.c \ + _ltoa.c \ + _spx.c \ + _startup.c \ + _strlen.c \ + _memmove.c \ + _heap.c \ + sprintf.c \ + vprintf.c \ + printf_fast.c \ + printf_fast_f.c \ + printf_tiny.c \ + printfl.c \ + bpx.c + +SOURCES = $(SOURCES_FLOAT) $(SOURCES_INT) $(SOURCES_LONG) $(SOURCES_SDCC) + +OBJECTS_FLOAT = $(SOURCES_FLOAT:%.c=$(PORT)/%.rel) +OBJECTS_INT = $(SOURCES_INT:%.c=$(PORT)/%.rel) +OBJECTS_LONG = $(SOURCES_LONG:%.c=$(PORT)/%.rel) +OBJECTS_SDCC = $(SOURCES_SDCC:%.c=$(PORT)/%.rel) + +OBJECTS = $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC) + +XA51_FLOAT = $(COMMON_FLOAT) + +XA51_INT = $(COMMON_INT) \ + _divsint.c \ + _divuint.c \ + _modsint.c \ + _moduint.c \ + _mulint.c + +XA51_LONG = $(COMMON_LONG) \ + _divulong.c \ + _mullong.c + +XA51_SDCC = $(COMMON_SDCC) \ + _memmove.c \ + _strlen.c \ + _heap.c + +XA51SOURCES = $(XA51_FLOAT) $(XA51_INT) $(XA51_LONG) $(XA51_SDCC) +XA51OBJECTS = $(XA51SOURCES:%.c=$(PORT)/%.rel) + +ifeq ($(LIB_TYPE), SDCCLIB) +LIB_FILES = $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/libsdcc.lib +else ifeq ($(LIB_TYPE), AR) +LIB_FILES = $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/libsdcc.lib +else ifeq ($(LIB_TYPE), RANLIB) +LIB_FILES = $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/libsdcc.lib +else +LIB_FILES = $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC) $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/libsdcc.lib +endif OEXT = .rel @@ -231,9 +193,16 @@ endif # Compiling entire program or any subproject # ------------------------------------------ -all: checkconf $(TARGETS) +all: + $(MAKE) checkconf + $(MAKE) $(TARGETS) -objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate +objects: + $(MAKE) build-dir + $(MAKE) $(OBJECTS) + $(MAKE) port-specific-objects + $(MAKE) $(LIB_FILES) + $(MAKE) clean_intermediate models: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ @@ -244,20 +213,23 @@ models: small-mcs51-stack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ - $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small PORTDIR=$(BUILDDIR)/small-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ + mkdir -p small-stack-auto; cp small/Makefile small-stack-auto; \ + $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small-stack-auto PORTDIR=$(abspath $(BUILDDIR)/small-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ fi model-mcs51-stack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ for model in $(MODELS); do \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ + mkdir -p $${model}-stack-auto; cp $${model}/Makefile $${model}-stack-auto; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$${model}-stack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi model-mcs51-xstack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ for model in $(MODELS); do \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ + mkdir -p $${model}-xstack-auto; cp $${model}/Makefile $${model}-xstack-auto; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack -DUSE_FLOATS=1" PORT=$${model}-xstack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-xstack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi @@ -276,8 +248,24 @@ model-xa51: $(MAKE) MODELFLAGS="-mxa51" PORT=xa51 objects-xa51; \ fi -objects-xa51: build-dir $(XA51OBJECTS) port-specific-objects - cd $(PORTDIR); ls *$(OEXT) > lib$(PORT).lib +objects-xa51: + $(MAKE) build-dir + $(MAKE) $(XA51OBJECTS) + $(MAKE) port-specific-objects + +$(PORTDIR)/lib$(PORT).lib: $(XA51OBJECTS) +ifeq ($(LIB_TYPE), SDCCLIB) + ../../bin/sdcclib -a $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS) +else ifeq ($(LIB_TYPE), AR) + ar -Sq $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS) +else ifeq ($(LIB_TYPE), RANLIB) + ar -Sq $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS) + $(top_builddir)/bin/asranlib $(PORTDIR)/lib$(PORT).lib +else + rm -f $(PORTDIR)/lib$(PORT).lib + for i in $(notdir $(basename $(XA51OBJECTS))); do echo $$i >> $(PORTDIR)/lib$(PORT).lib; done + cp $(XA51OBJECTS) $(PORTDIR) +endif model-z80: if grep '^z80\>' $(top_builddir)/ports.build > /dev/null; then \ @@ -289,41 +277,61 @@ model-gbz80: $(MAKE) MODELFLAGS="-mgbz80" PORT=gbz80 objects-z80 OEXT=.o; \ fi -objects-z80: build-dir $(Z80OBJECTS) port-specific-objects clean_intermediate - cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib +objects-z80: + $(MAKE) build-dir + $(MAKE) port-specific-objects + $(MAKE) clean_intermediate model-hc08: if grep '^hc08\>' $(top_builddir)/ports.build > /dev/null; 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 +objects-hc08: + $(MAKE) build-dir + $(MAKE) port-specific-objects + $(MAKE) clean_intermediate model-pic16: if grep '^pic16\>' $(top_builddir)/ports.build > /dev/null; then \ $(MAKE) PORT=pic16 objects-pic16; \ fi -objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16 +objects-pic16: + $(MAKE) build-dir + $(MAKE) port-specific-objects-pic16 + $(MAKE) clean_intermediate-pic16 model-pic14: if grep '^pic\>' $(top_builddir)/ports.build > /dev/null; then \ $(MAKE) PORT=pic objects-pic14; \ fi -objects-pic14: build-dir port-specific-objects-pic14 clean_intermediate-pic14 +objects-pic14: + $(MAKE) build-dir + $(MAKE) port-specific-objects-pic14 + $(MAKE) clean_intermediate-pic14 -build-dir: $(PORTDIR) +build-dir: + $(MAKE) $(PORTDIR) + $(MAKE) $(PORT) $(PORTDIR): mkdir -p $(PORTDIR) +$(PORT): + mkdir -p $(PORT) + port-specific-objects: +ifneq ($(LIB_TYPE), LIB) -if [ -f $(PORT)/Makefile ]; then \ - $(MAKE) -C $(PORT); \ - cp -f $(PORT)/*.lib $(PORT)/*$(OEXT) $(PORTDIR); \ + $(MAKE) -C $(PORT) PORT=$(PORT); \ fi +else + -if [ -f $(PORT)/Makefile ]; then \ + $(MAKE) -C $(PORT) PORT=$(PORT); \ + fi +endif port-specific-objects-pic16: -if [ -f $(PORT)/Makefile ]; then \ @@ -339,8 +347,36 @@ port-specific-objects-pic14: cp -f $(PORT)/bin/*.* $(PORTDIR); \ fi -lib-files: - cp $(srcdir)/*.lib $(PORTDIR) +$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC) +ifeq ($(LIB_TYPE), SDCCLIB) + ../../bin/sdcclib -a $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT) + ../../bin/sdcclib -a $(PORTDIR)/libint.lib $(OBJECTS_INT) + ../../bin/sdcclib -a $(PORTDIR)/liblong.lib $(OBJECTS_LONG) + ../../bin/sdcclib -a $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC) +else ifeq ($(LIB_TYPE), AR) + ar -Scq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT) + ar -Scq $(PORTDIR)/libint.lib $(OBJECTS_INT) + ar -Scq $(PORTDIR)/liblong.lib $(OBJECTS_LONG) + ar -Scq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC) +else ifeq ($(LIB_TYPE), RANLIB) + ar -Scq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(PORTDIR)/libfloat.lib + ar -Scq $(PORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(PORTDIR)/libint.lib + ar -Scq $(PORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(PORTDIR)/liblong.lib + ar -Scq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(PORTDIR)/libsdcc.lib +else + rm -f $(PORTDIR)/libfloat.lib + for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(PORTDIR)/libfloat.lib; done + cp $(OBJECTS_FLOAT) $(PORTDIR) + rm -f $(PORTDIR)/libint.lib + for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(PORTDIR)/libint.lib; done + cp $(OBJECTS_INT) $(PORTDIR) + rm -f $(PORTDIR)/liblong.lib + for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(PORTDIR)/liblong.lib; done + cp $(OBJECTS_LONG) $(PORTDIR) + rm -f $(PORTDIR)/libsdcc.lib + for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(PORTDIR)/libsdcc.lib; done + cp $(OBJECTS_SDCC) $(PORTDIR) +endif clean_intermediate: rm -f $(PORTDIR)/*.lst $(PORTDIR)/*.sym @@ -426,7 +462,7 @@ include $(srcdir)/clean.mk .SUFFIXES: .rel .o -$(PORTDIR)/%$(OEXT): %.c +$(PORT)/%$(OEXT): %.c $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ # Remaking configuration