X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=46d0e4c6cd78f92b9582265a15a9c9031417eb96;hb=f1c40004ae349f7cd3a1a5c5c85f62f695196370;hp=9f1b9fdea68ce9883dd664a98021d8640e74e46f;hpb=724cd0b658ac11ac5518ae566fcd3e9b3f822acf;p=fw%2Fsdcc

diff --git a/src/Makefile.in b/src/Makefile.in
index 9f1b9fde..46d0e4c6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,14 +20,14 @@ ifdef SDCC_SUB_VERSION
 CFLAGS		+= -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
 endif
 
-SLIBOBJS	= SDCCerr.o NewAlloc.o MySystem.o BuildCmd.o dbuf.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 \
-		  asm.o SDCCmacro.o SDCCutil.o SDCCdebug.o cdbFile.o
+		  asm.o SDCCmacro.o SDCCutil.o SDCCdebug.o cdbFile.o SDCCdwarf2.o
 
 SPECIAL		= SDCCy.h 
 ifeq ($(USE_ALT_LEX), 1)
@@ -37,13 +37,14 @@ else
 OBJECTS		+= SDCClex.o
 endif
 
+SLIBSOURCES	= $(patsubst %.o,$(SLIB)/%.c,$(SLIBOBJS))
 SOURCES		= $(patsubst %.o,%.c,$(OBJECTS))
 
 TARGET		= $(PRJDIR)/bin/sdcc$(EXEEXT)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf $(TARGET)
+all: checkconf version.h $(TARGET)
 
 $(PORT_LIBS): FORCE 
 	$(MAKE) -C `dirname $@`
@@ -56,14 +57,14 @@ $(PRJDIR)/support/gc/libgc.a:
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	$(INSTALL) $(TARGET) `echo $(bindir)/sdcc|sed '$(transform)'`
-	$(STRIP) `echo $(bindir)/sdcc|sed '$(transform)'`
+	$(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 $(DESTDIR)$(bindir)/sdcc$(EXEEXT)
 
 # Performing self-test
 # --------------------
@@ -78,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
@@ -95,7 +96,7 @@ include clean.mk
 # My rules
 # --------
 $(TARGET): $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS)
-	$(CC) -o $@ $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@@ -116,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 $<