68 lines
3.5 KiB
Diff
68 lines
3.5 KiB
Diff
--- pegasus/mak/program-unix.mak_old 2007-08-01 10:16:28.000000000 +0200
|
|
+++ pegasus/mak/program-unix.mak 2007-11-07 10:29:36.000000000 +0100
|
|
@@ -30,22 +30,12 @@
|
|
#//==============================================================================
|
|
INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
|
|
|
|
-ifndef LINK_RPATH
|
|
- LINK_RPATH = -Xlinker -rpath
|
|
-endif
|
|
-
|
|
LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
|
|
|
|
LINK_LIB_DIR = -Xlinker $(LIB_DIR)
|
|
|
|
LINK_ICU = -Xlinker ${ICU_INSTALL}/lib
|
|
|
|
-ifndef LINK_RPATH_LINK
|
|
- LINK_RPATH_LINK = -Xlinker -rpath-link
|
|
-endif
|
|
-
|
|
-
|
|
-
|
|
TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
|
|
|
|
S_OBJECTS = $(TMP_OBJECTS:.s=.o)
|
|
@@ -109,17 +99,17 @@
|
|
ifdef ICU_ROOT
|
|
ifdef ICU_INSTALL
|
|
ifdef PEGASUS_USE_RELEASE_DIRS
|
|
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
else
|
|
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
endif
|
|
endif
|
|
endif
|
|
else
|
|
ifdef PEGASUS_USE_RELEASE_DIRS
|
|
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
else
|
|
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
|
|
endif
|
|
endif
|
|
else
|
|
--- pegasus/mak/shared-library-unix.mak_old 2007-11-07 10:29:56.000000000 +0100
|
|
+++ pegasus/mak/shared-library-unix.mak 2007-11-07 10:38:10.000000000 +0100
|
|
@@ -107,14 +107,14 @@
|
|
ifneq ($(OS),darwin)
|
|
ifdef PEGASUS_USE_RELEASE_DIRS
|
|
LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
|
|
- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
|
|
+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS)
|
|
else
|
|
LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
|
|
- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
|
|
+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS)
|
|
endif
|
|
else
|
|
LINK_COMMAND = $(CXX) -dynamiclib
|
|
- LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
|
|
+ LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS)
|
|
endif
|
|
ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
|
|
LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
|