X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=46d0e4c6cd78f92b9582265a15a9c9031417eb96;hb=e76852b452d77ea7be72440493797b96f3504a5e;hp=2a3f65e79636c6cd5dd6dfe28adecfd94e8862da;hpb=c819b1e06a731b497ea9e0bfbb6b3b753306a190;p=fw%2Fsdcc

diff --git a/src/Makefile.in b/src/Makefile.in
index 2a3f65e7..46d0e4c6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,15 +8,11 @@ include $(PRJDIR)/Makefile.common
 
 USE_ALT_LEX	= 0
 
-PORTS		= mcs51 z80 avr ds390
+PORTS		= $(shell cat ../ports.build)
+ALLPORTS	= $(shell cat ../ports.all)
 PORT_LIBS	= $(PORTS:%=%/port.a)
 
-LIBS		= -lgc -lm @LIBS@
-ifeq ($(HAVE_LIBGC), 1)
-else
-LIBDIRS		= -L$(PRJDIR)/support/gc
-LIBGC		= $(PRJDIR)/support/gc/libgc.a
-endif
+LIBS		= -lm @LIBS@
 
 #CFLAGS          += -Werror
 
@@ -24,12 +20,14 @@ ifdef SDCC_SUB_VERSION
 CFLAGS		+= -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
 endif
 
-OBJECTS 	= SDCCy.o SDCCerr.o SDCChasht.o SDCCmain.o \
+SLIBOBJS	= SDCCerr.o NewAlloc.o MySystem.o BuildCmd.o dbuf.o findme.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 \
-		  SDCClrange.o SDCCptropt.o SDCCpeeph.o SDCCglue.o spawn.o \
-		  asm.o
+		  SDCClrange.o SDCCptropt.o SDCCpeeph.o SDCCglue.o \
+		  asm.o SDCCmacro.o SDCCutil.o SDCCdebug.o cdbFile.o SDCCdwarf2.o
 
 SPECIAL		= SDCCy.h 
 ifeq ($(USE_ALT_LEX), 1)
@@ -39,17 +37,19 @@ else
 OBJECTS		+= SDCClex.o
 endif
 
+SLIBSOURCES	= $(patsubst %.o,$(SLIB)/%.c,$(SLIBOBJS))
 SOURCES		= $(patsubst %.o,%.c,$(OBJECTS))
 
-TARGET		= $(PRJDIR)/bin/sdcc
-PACKIHX		= $(PRJDIR)/bin/packihx
+TARGET		= $(PRJDIR)/bin/sdcc$(EXEEXT)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: ports checkconf $(LIBGC) $(TARGET) $(PACKIHX)
+all: checkconf version.h $(TARGET)
 
-ports:
-	for i in $(PORTS); do $(MAKE) -C $$i; done
+$(PORT_LIBS): FORCE 
+	$(MAKE) -C `dirname $@`
+ 
+FORCE:
 
 $(PRJDIR)/support/gc/libgc.a:
 	cd $(PRJDIR)/support/gc && $(MAKE)
@@ -57,15 +57,14 @@ $(PRJDIR)/support/gc/libgc.a:
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	$(INSTALL) -s $(TARGET) $(bindir)/sdcc
-	$(INSTALL) $(PACKIHX) $(bindir)/packihx
+	$(INSTALL) $(TARGET) `echo $(DESTDIR)$(bindir)/sdcc$(EXEEXT)|sed '$(transform)'`
+	$(STRIP) `echo $(DESTDIR)$(bindir)/sdcc$(EXEEXT)|sed '$(transform)'`
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/sdcc
-	rm -f $(bindir)/packihx
+	rm -f $(DESTDIR)$(bindir)/sdcc$(EXEEXT)
 
 # Performing self-test
 # --------------------
@@ -80,15 +79,15 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(DESTDIR)$(bindir)
 
 
 # Creating dependencies
 # ---------------------
-dep: Makefile.dep
+dep: version.h Makefile.dep
 
-Makefile.dep: $(SOURCES) $(SPECIAL) *.h $(PRJDIR)/*.h
-	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(SOURCES) >Makefile.dep
+Makefile.dep: version.h $(SOURCES) $(SLIBSOURCES) $(SPECIAL) *.h $(PRJDIR)/*.h
+	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(SOURCES) $(SLIBSOURCES) >Makefile.dep
 
 include Makefile.dep
 include clean.mk
@@ -96,15 +95,15 @@ include clean.mk
 
 # My rules
 # --------
-$(TARGET): $(OBJECTS) $(PORT_LIBS)
-	$(CC) -o $@ $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
-
-$(PACKIHX): packihx
-	  $(INSTALL) packihx $(PACKIHX)
+$(TARGET): $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS)
+	$(CC) $(LDFLAGS) -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 $< > $@
 
@@ -118,6 +117,9 @@ SDCCy.c: SDCC.y
 SDCClex.c: SDCC.lex SDCCy.h
 	$(LEX) -t $< >$@
 
+version.h: ../ChangeLog
+	$(AWK) -f version.awk $< > $@
+
 .y.c:
 	rm -f $*.cc $*.h
 	$(YACC) -d $<
@@ -138,4 +140,3 @@ checkconf:
 	fi
 
 # End of main_in.mk/main.mk
-