diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-01-30 12:24:31 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-30 12:24:31 +0100 |
| commit | 773ca283af8fe90beabff12fcdde952fd918e9b2 (patch) | |
| tree | 363a327488cc606b555fb1d430967d843a91083c /cpp | |
| parent | changing UNSAFE make macro to MANAGED in C# (diff) | |
| download | ice-773ca283af8fe90beabff12fcdde952fd918e9b2.tar.bz2 ice-773ca283af8fe90beabff12fcdde952fd918e9b2.tar.xz ice-773ca283af8fe90beabff12fcdde952fd918e9b2.zip | |
More ICE_HOME related fixes for build system
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 52 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.mak | 19 |
2 files changed, 22 insertions, 49 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 4bbf417de83..4536a4e97d4 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -117,38 +117,34 @@ KERBEROS_HOME ?= /usr/kerberos # Don't change anything below this line! # ---------------------------------------------------------------------- -# Setup some variables for Make.rules.common +# +# Common definitions +# ice_language = cpp ifneq ($(shell test -d $(top_srcdir)/../cpp && echo 0),0) - # Don't require slice2cpp if it's the source distribution. + # Don't check for slice2cpp in ICE_HOME if building the source distribution slice_translator = slice2cpp endif -ifeq ($(shell test -f $(top_srcdir)/../config/Make.common.rules && echo 0),0) - include $(top_srcdir)/../config/Make.common.rules -else +ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) include $(top_srcdir)/config/Make.common.rules +else + include $(top_srcdir)/../config/Make.common.rules endif -SHELL = /bin/sh -VERSION_MAJOR = 3 -VERSION_MINOR = 3 -VERSION = 3.3.0 -SOVERSION = 33 - install_includedir = $(prefix)/include install_slicedir = $(prefix)/slice install_schemadir = $(prefix)/schema install_docdir = $(prefix)/doc - -INSTALL = cp -fp -INSTALL_PROGRAM = ${INSTALL} -INSTALL_LIBRARY = ${INSTALL} -INSTALL_DATA = ${INSTALL} - -OBJEXT = .o - -UNAME := $(shell uname) +ifdef ice_src_dist + bindir = $(top_srcdir)/bin + libdir = $(top_srcdir)/lib + includedir = $(top_srcdir)/include +else + bindir = $(ice_dir)/bin + libdir = $(ice_dir)/$(libsubdir) + includedir = $(ice_dir)/include +endif # # Platform specific definitions @@ -165,22 +161,6 @@ else libsubdir := lib endif -ifdef ice_src_dist - bindir = $(top_srcdir)/bin - libdir = $(top_srcdir)/lib - includedir = $(top_srcdir)/include -else - bindir = $(ice_dir)/bin - libdir = $(ice_dir)/$(libsubdir) - includedir = $(ice_dir)/include -endif - -ifdef ice_rpm_dist - slicedir = /usr/share/Ice-$(VERSION)/slice -else - slicedir = $(ice_dir)/slice -endif - ifneq ($(embedded_runpath_prefix),) runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) endif diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index d76b80e906a..1e9bcfdf591 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -82,10 +82,12 @@ MT = mt.exe # Don't change anything below this line! # ---------------------------------------------------------------------- -# Setup some variables for Make.rules.common.mak +# +# Common definitions +# ice_language = cpp !if !exist ($(top_srcdir)\..\cpp) -# Don't require slice2cpp if it's the source distribution. +# Don't check for slice2cpp in ICE_HOME if building the source distribution slice_translator = slice2cpp !endif @@ -95,10 +97,6 @@ slice_translator = slice2cpp !include $(top_srcdir)\config\Make.common.rules.mak !endif -SHELL = /bin/sh -VERSION = 3.3.0 -SOVERSION = 33 - !if "$(ice_src_dist)" != "" bindir = $(top_srcdir)\bin libdir = $(top_srcdir)\lib @@ -109,15 +107,13 @@ libdir = $(ice_dir)\lib includedir = $(ice_dir)\include !endif -slicedir = $(ice_dir)\slice - install_bindir = $(prefix)\bin install_includedir = $(prefix)\include install_slicedir = $(prefix)\slice install_schemadir = $(prefix)\schema install_docdir = $(prefix)\doc - -OBJEXT = .obj +install_libdir = $(prefix)\lib +libsubdir = lib SETARGV = setargv.obj @@ -131,9 +127,6 @@ SETARGV = setargv.obj !error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) !endif -install_libdir = $(prefix)\lib -libsubdir = lib - !if "$(OPTIMIZE)" != "yes" LIBSUFFIX = $(LIBSUFFIX)d !endif |