svn commit: samba r22046 - in branches/SAMBA_4_0/source: .
jpeach at samba.org
jpeach at samba.org
Mon Apr 2 20:19:01 GMT 2007
Author: jpeach
Date: 2007-04-02 20:19:00 +0000 (Mon, 02 Apr 2007)
New Revision: 22046
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22046
Log:
Rever r22040, which breaks the build on FreeBSD 5.4 (BSD make).
Modified:
branches/SAMBA_4_0/source/main.mk
Changeset:
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk 2007-04-02 20:10:21 UTC (rev 22045)
+++ branches/SAMBA_4_0/source/main.mk 2007-04-02 20:19:00 UTC (rev 22046)
@@ -377,27 +377,23 @@
# 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 \
More information about the samba-cvs
mailing list