2006-04-07 02:56:48 +00:00
|
|
|
--- pegasus/mak/library-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500
|
2006-04-11 02:31:28 +00:00
|
|
|
+++ pegasus/mak/library-unix.mak 2006-04-08 18:28:43.000000000 -0400
|
2006-04-07 02:56:48 +00:00
|
|
|
@@ -81,14 +81,14 @@
|
|
|
|
|
ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
|
|
|
|
|
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)
|
|
|
|
|
--- pegasus/mak/program-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500
|
2006-04-11 02:31:28 +00:00
|
|
|
+++ pegasus/mak/program-unix.mak 2006-04-08 18:28:43.000000000 -0400
|
2006-04-07 02:56:48 +00:00
|
|
|
@@ -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)
|
|
|
|
|
|
|
|
|
|
ifeq ($(OS_TYPE),windows)
|
|
|
|
|
@@ -118,9 +108,9 @@
|
|
|
|
|
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)
|
|
|
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
|
|
|
|
|
else
|
|
|
|
|
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
|
|
|
|
|
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
else
|
2006-04-11 02:31:28 +00:00
|
|
|
--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile.no-rpath 2006-01-30 11:17:40.000000000 -0500
|
|
|
|
|
+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2006-04-09 02:19:33.000000000 -0400
|
|
|
|
|
@@ -58,8 +58,7 @@
|
|
|
|
|
ifeq ($(OS),linux)
|
|
|
|
|
EXTRA_LIBRARIES += -lcrypt
|
|
|
|
|
ifdef PEGASUS_HAS_SSL
|
|
|
|
|
- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
|
|
|
|
|
- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
|
|
|
|
|
+ EXTRA_LIBRARIES += -lssl -lcrypto
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
--- pegasus/src/Pegasus/Common/Makefile.no-rpath 2006-01-30 11:17:05.000000000 -0500
|
|
|
|
|
+++ pegasus/src/Pegasus/Common/Makefile 2006-04-09 02:23:54.000000000 -0400
|
|
|
|
|
@@ -185,8 +185,7 @@
|
|
|
|
|
ifeq ($(OS),linux)
|
|
|
|
|
EXTRA_LIBRARIES += -lcrypt
|
|
|
|
|
ifdef PEGASUS_HAS_SSL
|
|
|
|
|
- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
|
|
|
|
|
- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
|
|
|
|
|
+ EXTRA_LIBRARIES += -lssl -lcrypto
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
