Martins changes for ddd

[fw/sdcc] / device / lib / Makefile.in

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index b4b868ef27925abd7cdf500aef92130ec9d80ffd..749a573cef63d5705dce05363b46eab2294a9067 100644 (file)
--- 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,6 +30,10 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
+lib_dir_suffix  = @lib_dir_suffix@
+
+sdcc_libdir     = $(datadir)/$(lib_dir_suffix)
+
 CPPFLAGS        = -I$(INCDIR)
 CFLAGS         = $(MODELFLAGS) --nostdinc --nostdlib
 
@@ -122,9 +125,9 @@ 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
 
-objects: build-dir $(OBJECTS) port-specific-objects lib-files
+objects: build-dir $(OBJECTS) port-specific-objects lib-files clean_intermediate
 
 models:
        if [ "`grep mcs51 ../../ports.build`" = mcs51 ]; then \
@@ -137,6 +140,11 @@ model-ds390:
        if [ "`grep ds390 ../../ports.build`" = ds390 ]; then \
          $(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 \
@@ -156,7 +164,7 @@ 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
 
 build-dir: $(PORTDIR)
@@ -173,23 +181,20 @@ port-specific-objects:
 lib-files:
        cp *.lib $(PORTDIR)
 
+clean_intermediate:
+       rm -f $(PORTDIR)/*.lst $(PORTDIR)/*.sym
+
 # 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 $(BUILDDIR)/* $(sdcc_libdir)
+       cp -r ds390 ds400 gbz80 z80 *.c $(sdcc_libdir)/src
+       rm `find $(sdcc_libdir)/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm'`
 
 # 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
 # --------------------
@@ -204,13 +209,14 @@ 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    
+       mkdir -p $(sdcc_libdir)/src
 
 # Creating dependencies
 # ---------------------