Commit dada90e

committed

Remove CORE_INCLUDES and use exclusively INCLUDES

1 parent ab28632 commit dada90eCopy full SHA for dada90e

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p`
`2`	`2`	`INSTALL = $(top_srcdir)/build/shtool install -c`
`3`	`3`	`INSTALL_DATA = $(INSTALL) -m 644`
`4`	`4`
`5`		`-COMMON_FLAGS = $(CORE_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)`
	`5`	`+COMMON_FLAGS = $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)`
`6`	`6`
`7`	`7`	`all: $(all_targets)`
`8`	`8`	`@echo`

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1351,15 +1351,14 @@ LIBZEND_BASIC_CHECKS`
`1351`	`1351`	`LIBZEND_DLSYM_CHECK`
`1352`	`1352`	`LIBZEND_OTHER_CHECKS`
`1353`	`1353`
`1354`		`-CORE_INCLUDES="$CORE_INCLUDES -I\$(top_builddir)/main -I\$(top_builddir)"`
`1355`		`-INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"`
`1356`		`-INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"`
`1357`		`-`
`1358`		`-if test "$abs_srcdir" != "$abs_builddir"; then`
`1359`		`- CORE_INCLUDES="$CORE_INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)"`
`1360`		`- INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend"`
`1361`		`- INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"`
`1362`		`-fi`
	`1354`	`+PHP_ADD_INCLUDE([$abs_srcdir], [1])`
	`1355`	`+PHP_ADD_INCLUDE([$abs_srcdir/main], [1])`
	`1356`	`+PHP_ADD_INCLUDE([$abs_builddir], [1])`
	`1357`	`+PHP_ADD_INCLUDE([$abs_builddir/main], [1])`
	`1358`	`+PHP_ADD_INCLUDE([$abs_builddir/TSRM])`
	`1359`	`+PHP_ADD_INCLUDE([$abs_builddir/Zend])`
	`1360`	`+PHP_ADD_INCLUDE([$abs_srcdir/Zend])`
	`1361`	`+PHP_ADD_INCLUDE([$abs_srcdir/TSRM])`
`1363`	`1362`
`1364`	`1363`	`ZEND_EXTRA_LIBS="$LIBS"`
`1365`	`1364`	`unset LIBS`
`@@ -1544,7 +1543,6 @@ PHP_SUBST_OLD(EXTRA_LDFLAGS)`
`1544`	`1543`	`PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)`
`1545`	`1544`	`PHP_SUBST_OLD(EXTRA_LIBS)`
`1546`	`1545`	`PHP_SUBST_OLD(ZEND_EXTRA_LIBS)`
`1547`		`-PHP_SUBST_OLD(CORE_INCLUDES)`
`1548`	`1546`	`PHP_SUBST_OLD(INCLUDES)`
`1549`	`1547`	`PHP_SUBST_OLD(EXTRA_INCLUDES)`
`1550`	`1548`	`PHP_SUBST_OLD(INSTALL_IT)`

Comments

(0)