Fixed up for AVR should not prefer globals

[fw/sdcc] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index eee05f8d6085aac95d1ff479cd3e1c0eedb18ce4..f2661ed574dd3493c1585192962f80df23241c41 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -6,28 +6,45 @@ PRJDIR                = ..
 
 include $(PRJDIR)/Makefile.common
 
-PORTS          = mcs51 z80
+USE_ALT_LEX    = 0
+
+PORTS          = mcs51 z80 avr ds390
 PORT_LIBS      = $(PORTS:%=%/port.a)
 
-LIBS           = -lgc @LIBS@
+LIBS           = -lgc -lm @LIBS@
 ifeq ($(HAVE_LIBGC), 1)
 else
 LIBDIRS                = -L$(PRJDIR)/support/gc
 LIBGC          = $(PRJDIR)/support/gc/libgc.a
 endif
 
-OBJECTS        = SDCCy.o SDCClex.o SDCCerr.o SDCChasht.o SDCCmain.o \
+ifdef SDCC_SUB_VERSION
+CFLAGS         += -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
+endif
+
+OBJECTS        = SDCCy.o SDCCerr.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 \
-                 SDCClrange.o SDCCptropt.o SDCCpeeph.o SDCCglue.o spawn.o
+                 SDCClrange.o SDCCptropt.o SDCCpeeph.o SDCCglue.o spawn.o \
+                 asm.o
+
+SPECIAL                = SDCCy.h 
+ifeq ($(USE_ALT_LEX), 1)
+OBJECTS                += altlex.o
+SPECIAL                += reswords.h
+else
+OBJECTS                += SDCClex.o
+endif
+
 SOURCES                = $(patsubst %.o,%.c,$(OBJECTS))
 
 TARGET         = $(PRJDIR)/bin/sdcc
+PACKIHX                = $(PRJDIR)/bin/packihx
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: ports checkconf $(LIBGC) $(TARGET)
+all: ports checkconf $(LIBGC) $(TARGET) $(PACKIHX)
 
 ports:
        for i in $(PORTS); do $(MAKE) -C $$i; done
@@ -35,11 +52,11 @@ ports:
 $(PRJDIR)/support/gc/libgc.a:
        cd $(PRJDIR)/support/gc && $(MAKE)
 
-
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
        $(INSTALL) -s $(TARGET) $(bindir)/sdcc
+       $(INSTALL) $(PACKIHX) $(bindir)/packihx
 
 
 # Deleting all the installed files
@@ -68,7 +85,7 @@ installdirs:
 # ---------------------
 dep: Makefile.dep
 
-Makefile.dep: $(SOURCES) *.h $(PRJDIR)/*.h
+Makefile.dep: $(SOURCES) $(SPECIAL) *.h $(PRJDIR)/*.h
        $(CPP) $(CPPFLAGS) $(M_OR_MM) $(SOURCES) >Makefile.dep
 
 include Makefile.dep
@@ -80,9 +97,18 @@ include clean.mk
 $(TARGET): $(OBJECTS) $(PORT_LIBS)
        $(CC) -o $@ $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
 
+$(PACKIHX): packihx
+         $(INSTALL) packihx $(PACKIHX)
+       
+
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
+reswords.h: reswords.gperf Makefile
+       gperf -o -k1,2,4 -t -C -N is_reserved_word $< > $@
+
+altlex.o: altlex.c SDCCy.h reswords.h
+
 SDCCy.h: SDCCy.c
 
 SDCCy.c: SDCC.y