upcast parameters to varargs functions to int or generic pointers where appropriate

[fw/sdcc] / Makefile

diff --git a/Makefile b/Makefile
index bf177067b2941d0192e34d058a8dd4110298c032..e24d27060ce8dadd0b2cb61912581640672131b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,21 +2,25 @@
 #
 #
 
+
 SHELL          = /bin/sh
 AUTOCONF       = autoconf
 
 PRJDIR         = .
+srcdir          = .
+include $(srcdir)/Makefile.common
+
 SDCC_MISC      = debugger/mcs51 sim/ucsim
 SDCC_LIBS      = support/cpp
 SDCC_ASLINK    = as/mcs51 as link
+SDCC_PACKIHX   = packihx
 
 PKGS           = $(SDCC_MISC) $(SDCC_LIBS) $(SDCC_ASLINK) \
-                 src device/include device/lib
+                 src device/include device/lib $(SDCC_PACKIHX)
 PKGS_TINI      = $(SDCC_LIBS) $(SDCC_ASLINK) \
-                 src device/include
+                 src device/include $(SDCC_PACKIHX)
 PORTS          = mcs51 z80
 
-srcdir          = .
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -25,10 +29,14 @@ all: checkconf sdcc
 tini: checkconf sdcc-tini
 
 sdcc-libs:
+ifeq ($(DISABLE_GC),1)
+       : skip boehm library when disabled by hand.
+else
 ifeq ($(CROSS_LIBGC),1)
        $(MAKE) -C support/gc -f Makefile.cross
 else
        $(MAKE) -C support/gc
+endif
 endif
        for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib; done
 
@@ -41,6 +49,9 @@ sdcc-aslink:
 sdcc-misc:
        for misc in $(SDCC_MISC); do $(MAKE) -C $$misc; done
 
+sdcc-packihx:
+       $(MAKE) -C $(SDCC_PACKIHX)
+
 sdcc-device:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib
@@ -49,10 +60,10 @@ sdcc-device-tini:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib modelDS390
 
-sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc-device
+sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc-device sdcc-packihx
        $(MAKE) -f main.mk all
 
-sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini
+sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
        $(MAKE) -f main.mk all
 
 # Some interesting sub rules