X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=b334928a0003272fd495e118d4d1248ecc831923;hb=bb226788dab3832b0ec0cda70874ce3fce4eebc6;hp=6084aa72a803b4c1e0ee41e5a5fd9d8ad3eea36c;hpb=043c22a94f39d137aaa14e5b54ec2a3e076580c9;p=fw%2Fsdcc

diff --git a/src/Makefile.in b/src/Makefile.in
index 6084aa72..b334928a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7,7 +7,7 @@ top_srcdir	= @top_srcdir@
 top_builddir	= @top_builddir@
 VPATH =           @srcdir@
 
-include $(top_builddir)Makefile.common
+include $(top_builddir)/Makefile.common
 
 USE_ALT_LEX	= 0
 
@@ -19,19 +19,21 @@ LIBS		= -lm @LIBS@
 
 #CFLAGS          += -Werror
 CPPFLAGS	+= -I$(srcdir)
+LDFLAGS		= @LDFLAGS@
 
 ifdef SDCC_SUB_VERSION
 CFLAGS		+= -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
 endif
 
-SLIBOBJS	= SDCCerr.o NewAlloc.o MySystem.o BuildCmd.o dbuf.o findme.o
+SLIBOBJS	= NewAlloc.o MySystem.o BuildCmd.o dbuf.o dbuf_string.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 SDCCdwarf2.o
+		  SDCCasm.o SDCCmacro.o SDCCutil.o SDCCdebug.o cdbFile.o SDCCdwarf2.o\
+		  SDCCerr.o
 
 SPECIAL		= SDCCy.h 
 ifeq ($(USE_ALT_LEX), 1)
@@ -44,7 +46,7 @@ endif
 SLIBSOURCES	= $(patsubst %.o,$(SLIB)/%.c,$(SLIBOBJS))
 SOURCES		= $(patsubst %.o,%.c,$(OBJECTS))
 
-TARGET		= $(top_builddir)bin/sdcc$(EXEEXT)
+TARGET		= $(top_builddir)/bin/sdcc$(EXEEXT)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -55,8 +57,8 @@ $(PORT_LIBS): FORCE
 
 FORCE:
 
-$(top_builddir)support/gc/libgc.a:
-	$(MAKE) -C $(top_builddir)support/gc
+$(top_builddir)/support/gc/libgc.a:
+	$(MAKE) -C $(top_builddir)/support/gc
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
@@ -96,7 +98,7 @@ Makefile.dep: version.h $(SOURCES) $(SLIBSOURCES) $(SPECIAL)
 # don't include Makefile.dep for the listed targets:
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs checkconf \
                                    clean distclean mostlyclean realclean)" ""
-  include Makefile.dep
+  -include Makefile.dep
 endif
 include $(srcdir)/clean.mk
 
@@ -142,7 +144,7 @@ version.h: ../ChangeLog
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(top_builddir)devel ]; then\
+	@if [ -f $(top_builddir)/devel ]; then\
 	  $(MAKE) -f $(srcdir)/conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" \
 	  freshconf;\
 	fi