diff options
| author | Joe George <joe@zeroc.com> | 2016-12-16 11:00:45 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-12-21 10:46:34 -0500 |
| commit | dbf8fb5053d9a3ace17e319379c5e29dd8158738 (patch) | |
| tree | de526af8eeccf15c0ed367504c4b626db1f0d2ef /php/src | |
| parent | Added support for running browser test with WebWorkers (diff) | |
| download | ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.bz2 ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.xz ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.zip | |
Replaced USE_BIN_DIST with ICE_BIN_DIST
ICE_BIN_DIST is a list of binary distributions to build against
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php5/Makefile.mk | 9 | ||||
| -rw-r--r-- | php/src/php7/Makefile.mk | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/php/src/php5/Makefile.mk b/php/src/php5/Makefile.mk index 25b812ecb7a..5395b6a80e3 100644 --- a/php/src/php5/Makefile.mk +++ b/php/src/php5/Makefile.mk @@ -13,16 +13,11 @@ IcePHP_target := php-module IcePHP_targetname := IcePHP IcePHP_targetdir := lib IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ - -I$(top_srcdir)/cpp/src $(php_cppflags) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) IcePHP_ldflags := $(php_ldflags) IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePHP_libs := mcpp -IcePHP_extra_sources := $(filter-out %Util.cpp %Python.cpp %Ruby.cpp,\ - $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ - $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp +IcePHP_extra_sources := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) srcs:: $(project) diff --git a/php/src/php7/Makefile.mk b/php/src/php7/Makefile.mk index 25b812ecb7a..5395b6a80e3 100644 --- a/php/src/php7/Makefile.mk +++ b/php/src/php7/Makefile.mk @@ -13,16 +13,11 @@ IcePHP_target := php-module IcePHP_targetname := IcePHP IcePHP_targetdir := lib IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ - -I$(top_srcdir)/cpp/src $(php_cppflags) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) IcePHP_ldflags := $(php_ldflags) IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePHP_libs := mcpp -IcePHP_extra_sources := $(filter-out %Util.cpp %Python.cpp %Ruby.cpp,\ - $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ - $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp +IcePHP_extra_sources := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) srcs:: $(project) |