svn commit: samba r18210 - in branches/SAMBA_4_0/source: . build/m4 build/smb_build heimdal_build

[metze at samba.org]

Author: metze
Date: 2006-09-07 09:38:49 +0000 (Thu, 07 Sep 2006)
New Revision: 18210

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18210

Log:
- reenable autodependencies
- and add -MT $@ to the dependency generation
  to notice changes in depdendecies of header files

you may need a 'make clean' or at least you need to remove
heimdal_build/replace.hd

metze
Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/smb_build/summary.pm
   branches/SAMBA_4_0/source/heimdal_build/config.h
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-09-07 09:05:50 UTC (rev 18209)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-09-07 09:38:49 UTC (rev 18210)
@@ -285,7 +285,6 @@
 		new_make=yes
 	fi
 fi
-new_make=no
 AC_MSG_RESULT($new_make)
 automatic_dependencies=no
 AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])

Modified: branches/SAMBA_4_0/source/build/smb_build/summary.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/summary.pm	2006-09-07 09:05:50 UTC (rev 18209)
+++ branches/SAMBA_4_0/source/build/smb_build/summary.pm	2006-09-07 09:38:49 UTC (rev 18210)
@@ -53,7 +53,7 @@
 	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
 	print "Automatic dependencies: ".
 	    (enabled($config->{automatic_dependencies})
-		    ? "yes" : "no (disabled till make doesn't spin)(install GNU make >= 3.81)") .
+		    ? "yes" : "no (install GNU make >= 3.81)") .
 	     "\n";
 	
 	print "Using shared libraries: " .

Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.h	2006-09-07 09:05:50 UTC (rev 18209)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h	2006-09-07 09:38:49 UTC (rev 18210)
@@ -10,6 +10,6 @@
 #define KRB5
 
 #include "include/config.h"
-#include "replace.h"
+#include "lib/replace/replace.h"
 
 #endif

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-09-07 09:05:50 UTC (rev 18209)
+++ branches/SAMBA_4_0/source/main.mk	2006-09-07 09:38:49 UTC (rev 18210)
@@ -317,15 +317,15 @@
 
 .c.d:
 	@echo "Generating dependencies for $<"
-	@$(CC) -M -MG -MP -MT $(<:.c=.o) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
+	@$(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
 
 .c.hd:
 	@echo "Generating host-compiler dependencies for $<"
-	@$(CC) -M -MG -MP -MT $(<:.c=.ho) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
+	@$(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
 
 include/includes.d: include/includes.h
 	@echo "Generating dependencies for $<"
-	@$(CC) -M -MG -MT include/includes.h.gch $(CFLAGS) $< -o $@
+	@$(CC) -M -MG -MT include/includes.h.gch -MT $@ $(CFLAGS) $< -o $@
 
 .c.o:
 	@if test -n "$(CC_CHECKER)"; then \