bug 435068: fix this code: d = (0 ? 4 : 8) + 1;

[fw/sdcc] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index a2c567ae7771dfc970fdd50673476c13d8c44a73..7302396c906b37cc5efab6371d2df001b4555118 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,7 +8,8 @@ include $(PRJDIR)/Makefile.common
 
 USE_ALT_LEX    = 0
 
-PORTS          = mcs51 z80 avr ds390 pic izt
+PORTS          = $(shell cat ../ports.build)
+ALLPORTS       = $(shell cat ../ports.all)
 PORT_LIBS      = $(PORTS:%=%/port.a)
 
 LIBS           = -lm @LIBS@
@@ -18,8 +19,10 @@ LIBS         = -lm @LIBS@
 ifdef SDCC_SUB_VERSION
 CFLAGS         += -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
 endif
+ 
+SLIBOBJS       = SDCCerr.o NewAlloc.o MySystem.o BuildCmd.o
 
-OBJECTS        = SDCCy.o SDCCerr.o SDCChasht.o SDCCmain.o \
+OBJECTS        = SDCCy.o SDCChasht.o SDCCmain.o \
                  SDCCsymt.o SDCCopt.o SDCCast.o SDCCmem.o SDCCval.o \
                  SDCCicode.o SDCCbitv.o SDCCset.o SDCClabel.o \
                  SDCCBBlock.o SDCCloop.o SDCCcse.o SDCCcflow.o SDCCdflow.o \
@@ -40,7 +43,7 @@ TARGET                = $(PRJDIR)/bin/sdcc
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: ports checkconf $(LIBGC) $(TARGET)
+all: ports checkconf $(TARGET)
 
 ports:
        for i in $(PORTS); do $(MAKE) -C $$i; done
@@ -89,12 +92,15 @@ include clean.mk
 
 # My rules
 # --------
-$(TARGET): $(OBJECTS) $(PORT_LIBS)
-       $(CC) -o $@ $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
+$(TARGET): $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS)
+       $(CC) -o $@ $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
+$(SLIBOBJS):%.o:$(SLIB)/%.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
 reswords.h: reswords.gperf Makefile
        gperf -o -k1,2,4 -t -C -N is_reserved_word $< > $@