From 281aabda625a6b66a6c0b04c81390fe2907753ae Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 25 May 2006 04:25:17 +0000 Subject: [PATCH] Makefile fixes, macro fix --- saml/Makefile.am | 2 ++ saml/saml1/core/impl/ProtocolsImpl.cpp | 2 +- samltest/Makefile.am | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/saml/Makefile.am b/saml/Makefile.am index 4bf8fb3..9796c35 100644 --- a/saml/Makefile.am +++ b/saml/Makefile.am @@ -4,6 +4,8 @@ lib_LTLIBRARIES = libsaml.la libsamlincludedir = $(includedir)/saml +sigincludedir = $(includedir)/signature + utilincludedir = $(includedir)/saml/util saml1coreincludedir = $(includedir)/saml/saml1/core diff --git a/saml/saml1/core/impl/ProtocolsImpl.cpp b/saml/saml1/core/impl/ProtocolsImpl.cpp index 1c6ee51..fd2b330 100644 --- a/saml/saml1/core/impl/ProtocolsImpl.cpp +++ b/saml/saml1/core/impl/ProtocolsImpl.cpp @@ -95,7 +95,7 @@ namespace opensaml { } IMPL_XMLOBJECT_CLONE(RespondWith); - IMPL_XMLOBJECT_CONTENT(); + IMPL_XMLOBJECT_CONTENT; }; class SAML_DLLLOCAL SubjectQueryImpl : public virtual SubjectQuery, diff --git a/samltest/Makefile.am b/samltest/Makefile.am index 394483f..77ef05b 100644 --- a/samltest/Makefile.am +++ b/samltest/Makefile.am @@ -9,9 +9,9 @@ endif samltest_h = \ samltest.h \ - saml/signature/SAML1AssertionTest.h \ - saml/signature/SAML1RequestTest.h \ - saml/signature/SAML1ResponseTest.h \ + signature/SAML1AssertionTest.h \ + signature/SAML1RequestTest.h \ + signature/SAML1ResponseTest.h \ saml1/core/impl/ActionTest.h \ saml1/core/impl/AdviceTest.h \ saml1/core/impl/AssertionIDReferenceTest.h \ -- 2.1.4