diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-09 19:30:54 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-09 19:30:54 -0400 |
| commit | db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2 (patch) | |
| tree | 2c534974d2fa0c302c8fada7f55c1c92cc5414e0 /php/src | |
| parent | Conflict fixes from previous commit (diff) | |
| download | ice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.tar.bz2 ice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.tar.xz ice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.zip | |
Removed libIceUtil and libSlice
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php5/Makefile.mk | 11 | ||||
| -rw-r--r-- | php/src/php7/Makefile.mk | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/php/src/php5/Makefile.mk b/php/src/php5/Makefile.mk index 12b4b0003c0..38043d01e92 100644 --- a/php/src/php5/Makefile.mk +++ b/php/src/php5/Makefile.mk @@ -13,9 +13,14 @@ IcePHP_target := php-module IcePHP_targetname := IcePHP IcePHP_targetdir := $(lang_srcdir)/lib IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated $(php_cppflags) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -I$(top_srcdir)/cpp/src -DSLICE_API_EXPORTS $(php_cppflags) IcePHP_ldflags := $(php_ldflags) -IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice Slice IceUtil +IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IcePHP_libs := mcpp +IcePHP_extra_sources := $(filter-out %Util.cpp %Python.cpp %Ruby.cpp %DotNetNames.cpp,\ + $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) -srcs:: $(project)
\ No newline at end of file +srcs:: $(project) diff --git a/php/src/php7/Makefile.mk b/php/src/php7/Makefile.mk index 12b4b0003c0..38043d01e92 100644 --- a/php/src/php7/Makefile.mk +++ b/php/src/php7/Makefile.mk @@ -13,9 +13,14 @@ IcePHP_target := php-module IcePHP_targetname := IcePHP IcePHP_targetdir := $(lang_srcdir)/lib IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated $(php_cppflags) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -I$(top_srcdir)/cpp/src -DSLICE_API_EXPORTS $(php_cppflags) IcePHP_ldflags := $(php_ldflags) -IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice Slice IceUtil +IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IcePHP_libs := mcpp +IcePHP_extra_sources := $(filter-out %Util.cpp %Python.cpp %Ruby.cpp %DotNetNames.cpp,\ + $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) -srcs:: $(project)
\ No newline at end of file +srcs:: $(project) |