diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-07 09:38:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:50 -0500 |
| commit | af1b64c92fe5d8164a654865930bf2fd85b03b28 (patch) | |
| tree | cfe9056c07b76b6fcc414155c94c1fe5dd93e78b | |
| parent | df35c7612f960cca13bb86029b35749ecd90254f (diff) | |
| download | samba-af1b64c92fe5d8164a654865930bf2fd85b03b28.tar.gz samba-af1b64c92fe5d8164a654865930bf2fd85b03b28.tar.bz2 samba-af1b64c92fe5d8164a654865930bf2fd85b03b28.zip | |
r18210: - 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
(This used to be commit 5ecf98cc189039023ff0a97f43eba7fb2c2cdc46)
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/summary.pm | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/config.h | 2 | ||||
| -rw-r--r-- | source4/main.mk | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 397a6dd044..7f166ff641 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -285,7 +285,6 @@ if test x$GNU_MAKE = x"yes"; then 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 ], []) diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index e63fa1ccc1..83b6ed0757 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -53,7 +53,7 @@ sub show($$) 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: " . diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 40c3e6d771..707e6f1127 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -10,6 +10,6 @@ #define KRB5 #include "include/config.h" -#include "replace.h" +#include "lib/replace/replace.h" #endif diff --git a/source4/main.mk b/source4/main.mk index cb8dbc1848..84a8f60544 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -317,15 +317,15 @@ unused_macros: .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 \ |