r22048: Sigh. Commit the other half of r22047.

(This used to be commit cbc15e963af67d6b7b4ad7b1f249667e2d7f7fd9)

diff --git a/source4/main.mk b/source4/main.mk
index 1d6e4ea858f83139a629e81f3d02f2f245fb6434..f7c24958320f1a3d08ac4599ac602c3ffbac82a8 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -349,16 +349,6 @@ unused_macros:
 
 .SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .$(SHLIBEXT) .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .idl .hd
 
-# Dependencies command
-DEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ \
-    `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
-# Dependencies for host objects
-HDEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ \
-    `$(PERL) $(srcdir)/script/cflags.pl $@` $(HOSTCC_CFLAGS) $< -o $@
-# Dependencies for precompiled headers
-PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \
-    $(CFLAGS) $< -o $@
-
 .c.d:
        @echo "Generating dependencies for $<"
        @$(DEPENDS)
@@ -371,30 +361,6 @@ include/includes.d: include/includes.h
        @echo "Generating dependencies for $<"
        @$(PCHDEPENDS)
 
-#
-# $< is broken in older BSD versions:
-# when $@ is foo/bar.o, $< could be torture/foo/bar.c
-# if it also exists. So better use $* which is foo/bar
-# and append .c manually to get foo/bar.c
-#
-
-# Run a static analysis checker
-CHECK = $(CC_CHECKER) `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(CFLAGS) $(PICFLAG) -c $*.c -o $@
-
-# Run the configured compiler
-COMPILE = $(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(CFLAGS) $(PICFLAG) -c $*.c -o $@
-
-# Run the compiler for the build host
-HCOMPILE = $(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(HOSTCC_CFLAGS) -c $*.c -o $@
-
-# Precompile headers
-PCHCOMPILE = @$(CC) -Ilib/replace \
-    `$(PERL) $(srcdir)/script/cflags.pl $@` \
-    $(CFLAGS) $(PICFLAG) -c $*.c -o $@
-
 .c.o:
        @if test -n "$(CC_CHECKER)"; then \
                echo "Checking  $< with '$(CC_CHECKER)'"; \