summaryrefslogtreecommitdiff
path: root/source4/rules.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 18:44:52 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 18:44:52 +0100
commit8e42aee98e09f6d59031f5bcf2ae454f1305f127 (patch)
tree56f6192c1867c9c5cbe171cd8d8093a122dffeb6 /source4/rules.mk
parent6c3ff9acd104dd0d55db41c3e049f3fe329c2e5d (diff)
downloadsamba-8e42aee98e09f6d59031f5bcf2ae454f1305f127.tar.gz
samba-8e42aee98e09f6d59031f5bcf2ae454f1305f127.tar.bz2
samba-8e42aee98e09f6d59031f5bcf2ae454f1305f127.zip
Remove workaround for some non-GNU makes.
(This used to be commit d817bcdc290cb03a16f10a11250ae35c1d36c848)
Diffstat (limited to 'source4/rules.mk')
-rw-r--r--source4/rules.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/rules.mk b/source4/rules.mk
index 7e36ca2647..8707fc3825 100644
--- a/source4/rules.mk
+++ b/source4/rules.mk
@@ -1,12 +1,12 @@
# Dependencies command
DEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ \
- $(CFLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@
+ $(CFLAGS) $(CPPFLAGS) $< -o $@
# Dependencies for host objects
HDEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ \
- $(HOSTCC_FLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@
+ $(HOSTCC_FLAGS) $(CPPFLAGS) $< -o $@
# Dependencies for precompiled headers
PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \
- $(CFLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@
+ $(CFLAGS) $(CPPFLAGS) $< -o $@
# $< is broken in older BSD versions:
# when $@ is foo/bar.o, $< could be torture/foo/bar.c
@@ -17,19 +17,19 @@ PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \
# building with $srcdir != $builddir work.
# Run a static analysis checker
-CHECK = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) $(CPPLAGS) -c $(FIRST_PREREQ) -o $@
+CHECK = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) $(CPPLAGS) -c $< -o $@
# Run the configured compiler
COMPILE = $(CC) $(CFLAGS) $(PICFLAG) \
$(CPPFLAGS) \
- -c $(FIRST_PREREQ) -o $@
+ -c $< -o $@
# Run the compiler for the build host
-HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@
+HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) $(CPPFLAGS) -c $< -o $@
# Precompile headers
PCHCOMPILE = @$(CC) -Ilib/replace \
- $(CFLAGS) $(PICFLAG) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@
+ $(CFLAGS) $(PICFLAG) $(CPPFLAGS) -c $< -o $@
# Partial linking
PARTLINK = @$(PROG_LD) -r