diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-11 23:04:01 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-11 23:04:01 +0200 |
| commit | 1cc361c8e2c32277d4cf89619939d5d7ddb5e51a (patch) | |
| tree | 43a9844fc5c779e83ce4fbd71810d2735c602446 | |
| parent | Minor IceLocatorDiscovery fix for consistency (diff) | |
| download | ice-1cc361c8e2c32277d4cf89619939d5d7ddb5e51a.tar.bz2 ice-1cc361c8e2c32277d4cf89619939d5d7ddb5e51a.tar.xz ice-1cc361c8e2c32277d4cf89619939d5d7ddb5e51a.zip | |
Fixed ICE-7800 - moved python/ruby/php ldflags at the end
| -rw-r--r-- | php/src/php5/Makefile.mk | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/Makefile.mk | 2 | ||||
| -rw-r--r-- | ruby/src/IceRuby/Makefile.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/php/src/php5/Makefile.mk b/php/src/php5/Makefile.mk index aa1ecea31ba..74b570f96b4 100644 --- a/php/src/php5/Makefile.mk +++ b/php/src/php5/Makefile.mk @@ -14,7 +14,7 @@ IcePHP_targetname := IcePHP IcePHP_targetdir := lib IcePHP_installdir := $(install_phplibdir) IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) -IcePHP_ldflags := $(php_ldflags) +IcePHP_system_libs := $(php_ldflags) IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePHP_extra_sources := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk index e18d0c3d243..d89e2007622 100644 --- a/python/modules/IcePy/Makefile.mk +++ b/python/modules/IcePy/Makefile.mk @@ -15,7 +15,7 @@ IcePy_targetdir := $(lang_srcdir)/python IcePy_installdir := $(install_pythondir) IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ -I$(top_srcdir)/cpp/src $(python_cppflags) -IcePy_ldflags := $(python_ldflags) +IcePy_system_libs := $(python_ldflags) IcePy_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePy_libs := mcpp IcePy_extra_sources := $(filter-out %Util.cpp %Ruby.cpp,\ diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk index b65b6eb06fb..351c72df5ed 100644 --- a/ruby/src/IceRuby/Makefile.mk +++ b/ruby/src/IceRuby/Makefile.mk @@ -15,7 +15,7 @@ IceRuby_targetdir := $(lang_srcdir)/ruby IceRuby_installdir := $(install_rubylibdir) IceRuby_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ -I$(top_srcdir)/cpp/src $(ruby_cppflags) -IceRuby_ldflags := $(ruby_ldflags) +IceRuby_system_libs := $(ruby_ldflags) IceRuby_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IceRuby_libs := mcpp IceRuby_extra_sources := $(filter-out %Util.cpp %Python.cpp,\ |