diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:17:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:17:56 +0000 |
| commit | 48480927a14aa476954620a96a0fc0480f648fa2 (patch) | |
| tree | 920c758577b80696915608bba6ad2bea2399bcd2 /libxmlsec | |
| parent | 806ed795316526447f44d28b31b24af1e11ada08 (diff) | |
INTEGRATION: CWS cmcfixes48 (1.17.14); FILE MERGED
2008/08/01 14:04:33 cmc 1.17.14.1: #i92247# build a pic .a on unix, we only link in one place now, so this reduces size slightly and removes the conflicting libxmlsec1 provides from the hacked version vs the system one on AutoReqProv rpm systems
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 516a603c3fe8..1a39c31ba191 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # # This file is part of OpenOffice.org. # @@ -124,18 +124,10 @@ xmlsec_LDFLAGS+=-Wl,-z,noexecstack LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS -#.IF "$(OS)$(COM)"=="LINUXGCC" -#LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -#.ENDIF # "$(OS)$(COM)"=="LINUXGCC" -#.IF "$(OS)$(COM)"=="SOLARISC52" -#LDFLAGS:=-Wl,-R'$$$$ORIGIN' -#.ENDIF # "$(OS)$(COM)"=="SOLARISC52" -#.EXPORT: LDFLAGS .ENDIF CONFIGURE_DIR= -#CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" LDFLAGS="$(xmlsec_LDFLAGS)" CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) +CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but.... @@ -155,9 +147,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUTDIR2INC=include$/xmlsec -.IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2BIN+=src$/.libs$/libxmlsec1-1.dll src$/nss$/.libs$/libxmlsec1-nss-1.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto-1.dll .ELSE @@ -165,7 +155,7 @@ OUT2LIB+=win32$/binaries$/*.lib OUT2BIN+=win32$/binaries$/*.dll .ENDIF .ELSE -OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so* +OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a .ENDIF # --- Targets ------------------------------------------------------ |