From 4e8fd9f2f4b06dfed9f0c58b476463c34f2c2aa7 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Mon, 2 Apr 2007 20:19:00 +0000
Subject: r22046: Rever r22040, which breaks the build on FreeBSD 5.4 (BSD
 make). (This used to be commit 5a96812929cc8521566017c881b4c3459e7b8a91)

---
 source4/main.mk | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'source4/main.mk')

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 \
-- 
cgit