X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2FMakefile.in;h=424d841fc9281ead67d4e0fb5d3884eca89ec6c7;hb=bfd7431078b6d902b991d098798911bd612bf670;hp=1d474e0f903bb51ffb2535e73ca32cc95aa87cf3;hpb=bb03e8f08c9d4d2e5779b9b3bda882917414ee98;p=fw%2Fsdcc diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 1d474e0f..424d841f 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -12,8 +12,17 @@ CPP = @CPP@ INSTALL = @INSTALL@ CP = @CP@ +ifeq ($(shell uname -s),Linux) +CP_U = $(CP) -u +else +CP_U = $(CP) +endif + PRJDIR = ../.. INCDIR = $(PRJDIR)/device/include +ifndef PORTINCDIR +PORTINCDIR = $(INCDIR)/mcs51 +endif CC = $(PRJDIR)/bin/sdcc CPP = $(PRJDIR)/bin/sdcpp @@ -34,13 +43,15 @@ lib_dir_suffix = @lib_dir_suffix@ sdcc_libdir = $(DESTDIR)$(datadir)/$(lib_dir_suffix) -CPPFLAGS = -I$(INCDIR) -CFLAGS = $(MODELFLAGS) --nostdinc +CPPFLAGS = -I$(INCDIR) -I$(PORTINCDIR) +CFLAGS = $(MODELFLAGS) --nostdinc --std-sdcc99 BUILDDIR = build # Default PORT = z80 +ifndef PORTDIR PORTDIR = $(BUILDDIR)/$(PORT) +endif SOURCES = _atof.c _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \ _decdptr.c _divsint.c _divslong.c _divuint.c \ @@ -167,42 +178,44 @@ include incl.mk # Compiling entire program or any subproject # ------------------------------------------ -all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 - -# model-pic16 -# (needs gputils curently not available of sourceforge's compile farm) +all: checkconf models small-mcs51-stack-auto model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 model-pic16 model-pic14 objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate models: if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \ for model in $(MODELS); do \ - $(MAKE) MODELFLAGS="--model-$$model" PORT=$$model objects; \ + $(MAKE) MODELFLAGS="--model-$$model" PORT=$$model PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi +small-mcs51-stack-auto: + if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \ + $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small PORTDIR=$(BUILDDIR)/small-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ + fi + model-mcs51-stack-auto: if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \ for model in $(MODELS); do \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model-stack-auto objects; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi model-mcs51-xstack-auto: if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \ for model in $(MODELS); do \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model-xstack-auto objects; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi model-ds390: if [ "`grep ds390 ../../ports.build`" = ds390 ]; then \ - $(MAKE) MODELFLAGS="-mds390" PORT=ds390 objects; \ + $(MAKE) MODELFLAGS="-mds390" PORT=ds390 PORTINCDIR=$(INCDIR)/mcs51 objects; \ fi model-ds400: if [ "`grep ds400 ../../ports.build`" = ds400 ]; then \ - $(MAKE) MODELFLAGS="-mds400" PORT=ds400 objects; \ + $(MAKE) MODELFLAGS="-mds400" PORT=ds400 PORTINCDIR=$(INCDIR)/mcs51 objects; \ fi model-xa51: @@ -237,11 +250,16 @@ objects-hc08: build-dir $(HC08OBJECTS) port-specific-objects clean_intermediate model-pic16: if [ "`grep pic16 ../../ports.build`" = pic16 ]; then \ $(MAKE) MODELFLAGS="-mpic16" PORT=pic16 OEXT=.lib objects-pic16; \ - fi + fi objects-pic16: build-dir port-specific-objects-pic16 clean_intermediate-pic16 - cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib + -cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib +# yes, we do reuse the *-pic16 rules for pic14 +model-pic14: + if [ "`grep pic ../../ports.build | grep -v pic16`" = pic ]; then \ + $(MAKE) MODELFLAGS="-mpic14" PORT=pic OEXT=.lib objects-pic16; \ + fi build-dir: $(PORTDIR) @@ -255,7 +273,8 @@ port-specific-objects: fi port-specific-objects-pic16: - if [ -d $(PORT) ]; then \ + -if [ -d $(PORT) ]; then \ + mkdir -p $(PORT)/bin; \ $(MAKE) -C $(PORT); \ cp -f $(PORT)/bin/*.* $(PORTDIR); \ fi @@ -272,9 +291,18 @@ clean_intermediate-pic16: # Compiling and installing everything and runing test # --------------------------------------------------- install: all installdirs - 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'` + $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir) + $(CP_U) -r $(MODELS) mcs51 ds390 ds400 gbz80 z80 hc08 pic pic16 *.c $(sdcc_libdir)/src + for srcdir in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic pic16; do \ + find $(sdcc_libdir)/src/$$srcdir -depth \ + \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \ + -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'build' -o -name 'bin' \) \ + -exec rm -r {} \; ; \ + done + find $(sdcc_libdir)/src/mcs51 -depth \ + \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \ + -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' \) \ + -exec rm -r {} \; # Deleting all the installed files # -------------------------------- @@ -296,20 +324,19 @@ installcheck: installdirs: [ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir) for model in $(MODELS); do \ - [ -d $(sdcc_libdir)/$$model ] || \ - mkdir -p $(sdcc_libdir)/$$model; \ + [ -d $(sdcc_libdir)/$$model ] || \ + mkdir -p $(sdcc_libdir)/$$model; \ + done + for libdir in small-stack-auto ds390 ds400 hc08 pic16 pic; do \ + [ -d $(sdcc_libdir)/$$libdir ] || mkdir -p $(sdcc_libdir)/$$libdir; \ done - [ -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 - [ -d $(sdcc_libdir)/pic16 ] || mkdir -p $(sdcc_libdir)/pic16 mkdir -p $(sdcc_libdir)/src # Creating dependencies # --------------------- dep: Makefile.dep -Makefile.dep: $(SOURCES) $(INCDIR)/*.h +Makefile.dep: $(SOURCES) $(INCDIR)/*.h $(PORTINCDIR)/*.h rm -f Makefile.dep for i in $(SOURCES); do \ $(CPP) -std=c99 -M $(CPPFLAGS) $$i >$${i}.dep; \