Author: pini
Date: Mon Jun 2 00:39:44 2008
New Revision: 662350
URL: http://svn.apache.org/viewvc?rev=662350&view=rev
Log:
Fixed build break in saml
Modified:
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am
webservices/rampart/trunk/c/src/util/Makefile.am
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Mon Jun 2 00:39:44 2008
@@ -134,7 +134,6 @@
src/omxmlsec/tokens/Makefile \
src/omxmlsec/openssl/Makefile \
src/omxmlsec/c14n/Makefile \
- src/omxmlsec/saml/Makefile \
src/data/Makefile \
src/handlers/Makefile \
src/core/Makefile \
Modified: webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am Mon Jun
2 00:39:44 2008
@@ -18,7 +18,6 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lsaml \
-ltrust \
-lmod_rampart \
$(GUTHTHILA_LIBS) \
Modified: webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am Mon Jun 2
00:39:44 2008
@@ -18,7 +18,6 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lsaml \
-lmod_rampart \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am Mon Jun 2
00:39:44 2008
@@ -11,7 +11,6 @@
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
-lmod_rampart \
- -lsaml \
-ltrust
Modified: webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/Makefile.am Mon Jun 2 00:39:44
2008
@@ -1,11 +1,14 @@
-SUBDIRS = tokens openssl c14n saml
+SUBDIRS = tokens openssl c14n
lib_LTLIBRARIES = libomxmlsec.la
libomxmlsec_la_SOURCES = ctx.c buffer.c key.c cipher.c error.c axis2_utils.c
axiom.c \
iv.c xml_encryption.c encryption.c\
utility.c asym_ctx.c
x509_cert.c key_mgr.c sign_part.c sign_ctx.c \
xml_signature.c signature.c
transform.c transforms_factory.c xml_key_processor.c \
- xml_key_info_builder.c
derivation.c
+ xml_key_info_builder.c
derivation.c saml/assertion.c saml/auth_des_stmt.c \
+ saml/condition.c saml/query.c
saml/response.c saml/subject.c saml/attr_stmt.c \
+ saml/auth_smt.c saml/id_type.c
saml/request.c saml/stmt.c saml/sutil.c
+
libomxmlsec_la_LIBADD = @OPENSSLLIB@ \
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am Mon Jun 2
00:39:44 2008
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES =libsaml.la
+noinst_LTLIBRARIES =libsaml.la
libsaml_la_SOURCES = assertion.c \
attr_stmt.c \
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?rev=662350&r1=662349&r2=662350&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Mon Jun 2 00:39:44 2008
@@ -12,8 +12,8 @@
librampart_util_la_LIBADD = -lssl \
+ $(top_builddir)/src/omxmlsec/saml/libsaml.la \
-lcrypto \
- -lsaml \
@OPENSSLLIB@
INCLUDES = -I$(top_builddir)/include \
