summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-31 00:15:27 +0000
committerSascha Schumann <sas@php.net>1999-12-31 00:15:27 +0000
commit6bbe440f6d6d054e6547da4bc344dd26746dc68d (patch)
tree364435e0901e2294484ae31c0b4b0b7b4c0bf122
parent7c88c6fce1818a0f652e6488e8907a6ed64ff48b (diff)
downloadphp-git-6bbe440f6d6d054e6547da4bc344dd26746dc68d.tar.gz
Perform manual interpolation for EXTRA_INCLUDES and EXTRA_CFLAGS
-rw-r--r--build/rules.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/build/rules.mk b/build/rules.mk
index bb2a444a7b..2b6a0f7c3a 100644
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -26,12 +26,10 @@
include $(DEPTH)/config_vars.mk
-INCLUDES += $(EXTRA_INCLUDES)
-CFLAGS += $(EXTRA_CFLAGS)
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
INSTALL = $(top_srcdir)/build/shtool install -c
INSTALL_DATA = $(INSTALL) -m 644
@@ -97,7 +95,7 @@ install-p: $(targets) $(install_targets)
distclean-p depend-p clean-p:
depend: depend-recursive
- test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) *.c > .deps
+ test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps
clean: clean-recursive clean-x