r22040: Use $< to specify the immediate prerequisit instead of $*. This is

needed for VPATH to find the correct files when srcdir != builddir.

This checkin is a test to see which platforms this change will break.
(This used to be commit 1d4e836a50ffea452e688e25c2cae02a410247be)

diff --git a/source4/main.mk b/source4/main.mk
index 1d6e4ea858f83139a629e81f3d02f2f245fb6434..fe7c1e57d86af90ac7adb4238d5b0ae24388ed47 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -377,23 +377,27 @@ 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 $*.c -o $@
+    $(CFLAGS) $(PICFLAG) -c $< -o $@
 
 # Run the configured compiler
 COMPILE = $(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(CFLAGS) $(PICFLAG) -c $*.c -o $@
+    $(CFLAGS) $(PICFLAG) -c $< -o $@
 
 # Run the compiler for the build host
 HCOMPILE = $(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(HOSTCC_CFLAGS) -c $*.c -o $@
+    $(HOSTCC_CFLAGS) -c $< -o $@
 
 # Precompile headers
 PCHCOMPILE = @$(CC) -Ilib/replace \
     `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(CFLAGS) $(PICFLAG) -c $*.c -o $@
+    $(CFLAGS) $(PICFLAG) -c $< -o $@
 
 .c.o:
        @if test -n "$(CC_CHECKER)"; then \