diff options
| author | James Peach <jpeach@samba.org> | 2007-04-02 20:19:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:45 -0500 |
| commit | 4e8fd9f2f4b06dfed9f0c58b476463c34f2c2aa7 (patch) | |
| tree | a61163a810f5fa637361b91ad9c10b6ddf76c651 | |
| parent | 769efdf048d80c4081487d555649de0f31738dd1 (diff) | |
| download | samba-4e8fd9f2f4b06dfed9f0c58b476463c34f2c2aa7.tar.gz samba-4e8fd9f2f4b06dfed9f0c58b476463c34f2c2aa7.tar.bz2 samba-4e8fd9f2f4b06dfed9f0c58b476463c34f2c2aa7.zip | |
r22046: Rever r22040, which breaks the build on FreeBSD 5.4 (BSD make).
(This used to be commit 5a96812929cc8521566017c881b4c3459e7b8a91)
| -rw-r--r-- | source4/main.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source4/main.mk b/source4/main.mk index fe7c1e57d8..1d6e4ea858 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -377,27 +377,23 @@ include/includes.d: include/includes.h # if it also exists. So better use $* which is foo/bar # and append .c manually to get foo/bar.c # -# But if srcdir != builddir, $* does not contain the filename -# that was found be traversing VPATH. So we are back to $<. -# -- jpeach -# # Run a static analysis checker CHECK = $(CC_CHECKER) `$(PERL) $(srcdir)/script/cflags.pl $@` \ - $(CFLAGS) $(PICFLAG) -c $< -o $@ + $(CFLAGS) $(PICFLAG) -c $*.c -o $@ # Run the configured compiler COMPILE = $(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` \ - $(CFLAGS) $(PICFLAG) -c $< -o $@ + $(CFLAGS) $(PICFLAG) -c $*.c -o $@ # Run the compiler for the build host HCOMPILE = $(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` \ - $(HOSTCC_CFLAGS) -c $< -o $@ + $(HOSTCC_CFLAGS) -c $*.c -o $@ # Precompile headers PCHCOMPILE = @$(CC) -Ilib/replace \ `$(PERL) $(srcdir)/script/cflags.pl $@` \ - $(CFLAGS) $(PICFLAG) -c $< -o $@ + $(CFLAGS) $(PICFLAG) -c $*.c -o $@ .c.o: @if test -n "$(CC_CHECKER)"; then \ |