X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=6084aa72a803b4c1e0ee41e5a5fd9d8ad3eea36c;hb=c42e9051755428d14eb620abc9eda86d43479a1a;hp=46d0e4c6cd78f92b9582265a15a9c9031417eb96;hpb=5979bbd157a5f3cd8018aed666e4dd41a3e08edf;p=fw%2Fsdcc

diff --git a/src/Makefile.in b/src/Makefile.in
index 46d0e4c6..6084aa72 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,9 +2,12 @@
 #
 #
 
-PRJDIR		= ..
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+top_builddir	= @top_builddir@
+VPATH =           @srcdir@
 
-include $(PRJDIR)/Makefile.common
+include $(top_builddir)Makefile.common
 
 USE_ALT_LEX	= 0
 
@@ -15,6 +18,7 @@ PORT_LIBS	= $(PORTS:%=%/port.a)
 LIBS		= -lm @LIBS@
 
 #CFLAGS          += -Werror
+CPPFLAGS	+= -I$(srcdir)
 
 ifdef SDCC_SUB_VERSION
 CFLAGS		+= -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
@@ -40,19 +44,19 @@ endif
 SLIBSOURCES	= $(patsubst %.o,$(SLIB)/%.c,$(SLIBOBJS))
 SOURCES		= $(patsubst %.o,%.c,$(OBJECTS))
 
-TARGET		= $(PRJDIR)/bin/sdcc$(EXEEXT)
+TARGET		= $(top_builddir)bin/sdcc$(EXEEXT)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
 all: checkconf version.h $(TARGET)
 
 $(PORT_LIBS): FORCE 
-	$(MAKE) -C `dirname $@`
- 
+	$(MAKE) -C $(dir $@)
+
 FORCE:
 
-$(PRJDIR)/support/gc/libgc.a:
-	cd $(PRJDIR)/support/gc && $(MAKE)
+$(top_builddir)support/gc/libgc.a:
+	$(MAKE) -C $(top_builddir)support/gc
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
@@ -86,11 +90,15 @@ installdirs:
 # ---------------------
 dep: version.h Makefile.dep
 
-Makefile.dep: version.h $(SOURCES) $(SLIBSOURCES) $(SPECIAL) *.h $(PRJDIR)/*.h
-	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(SOURCES) $(SLIBSOURCES) >Makefile.dep
+Makefile.dep: version.h $(SOURCES) $(SLIBSOURCES) $(SPECIAL)
+	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) >Makefile.dep
 
-include Makefile.dep
-include clean.mk
+# don't include Makefile.dep for the listed targets:
+ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs checkconf \
+                                   clean distclean mostlyclean realclean)" ""
+  include Makefile.dep
+endif
+include $(srcdir)/clean.mk
 
 
 # My rules
@@ -118,7 +126,7 @@ SDCClex.c: SDCC.lex SDCCy.h
 	$(LEX) -t $< >$@
 
 version.h: ../ChangeLog
-	$(AWK) -f version.awk $< > $@
+	$(AWK) -f $(srcdir)/version.awk $< > $@
 
 .y.c:
 	rm -f $*.cc $*.h
@@ -134,8 +142,8 @@ version.h: ../ChangeLog
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(PRJDIR)/devel ]; then\
-	  $(MAKE) -f $(srcdir)/conf.mk srcdir="$(srcdir)" PRJDIR="$(PRJDIR)" \
+	@if [ -f $(top_builddir)devel ]; then\
+	  $(MAKE) -f $(srcdir)/conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" \
 	  freshconf;\
 	fi