Justtechjobs.com Find a programming school near you






Online Campus Both


php4-beta | 199912

[PHP4BETA] cvs: /php4/build rules.mk From: Sascha Schumann (sascha <email protected>)
Date: 12/30/99

sas Thu Dec 30 19:15:58 1999 EDT

  Modified files:
    /php4/build rules.mk
  Log:
  Perform manual interpolation for EXTRA_INCLUDES and EXTRA_CFLAGS
  
  
Index: php4/build/rules.mk
diff -u php4/build/rules.mk:1.3 php4/build/rules.mk:1.4
--- php4/build/rules.mk:1.3 Thu Dec 30 02:15:43 1999
+++ php4/build/rules.mk Thu Dec 30 19:15:27 1999
@@ -21,17 +21,15 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: rules.mk,v 1.3 1999/12/30 07:15:43 sas Exp $
+# $Id: rules.mk,v 1.4 1999/12/31 00:15:27 sas Exp $
 #
 
 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 @@
 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
 

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>