Updated list of files generated by SWIG in C# and Java bindings; fixed PHP

Makefile.am; use $(srcdir) to get correct directory in code generation python
scrips.  make distcheck works after that.

9 files changed, 58 insertions, 56 deletions

diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index bba5b74e..7bbbbe7c 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -39,26 +39,16 @@ clean-local:
 	-rm lasso.dll lasso-sharp.pc liblassosharpglue_wrap.c.bak
 
 SWIG_FILES = liblassosharpglue_wrap.c \
-	lassoPINVOKE.cs        lasso.cs          Server.cs  \
-	Defederation.cs        Request.cs        Session.cs \
-	Identity.cs            Response.cs       AuthnRequest.cs \
-	Lecp.cs                AuthnResponse.cs  Login.cs \
-	Logout.cs              LogoutResponse.cs LogoutRequest.cs \
-	FederationTerminationNotification.cs     Assertion.cs \
-	NameIdentifierMapping.cs NameRegistration.cs Node.cs \
-	Provider.cs            ProviderIds.cs    Providers.cs \
-	RegisterNameIdentifierRequest.cs \
-	RegisterNameIdentifierResponse.cs \
-	SWIGTYPE_p_void.cs \
-	lassoHttpMethod.cs \
-	lassoLoginProtocolProfile.cs \
-	lassoMessageType.cs \
-	lassoNameIdentifierFormatType.cs \
-	lassoProviderRole.cs \
-	lassoRequestType.cs \
-	lassoSignatureMethod.cs
-
-
+	Defederation.cs Identity.cs lasso.cs lassoHttpMethod.cs \
+	lassoLoginProtocolProfile.cs lassoMessageType.cs lassoPINVOKE.cs \
+	LassoProviderRole.cs lassoRequestType.cs lassoSignatureMethod.cs \
+	Lecp.cs LibAssertion.cs LibAuthnRequest.cs LibAuthnResponse.cs \
+	LibFederationTerminationNotification.cs LibLogoutRequest.cs \
+	LibLogoutResponse.cs LibRegisterNameIdentifierRequest.cs \
+	LibRegisterNameIdentifierResponse.cs Login.cs Logout.cs \
+	NameIdentifierMapping.cs NameRegistration.cs Node.cs Provider.cs \
+	ProviderIds.cs SamlpRequest.cs SamlpResponse.cs Server.cs \
+	Session.cs SWIGTYPE_p_void.cs
 
 
 EXTRA_DIST = lasso-sharp.pc.in lasso.dll.config AssemblyInfo.cs lasso-sharp.snk $(SWIG_FILES)
diff --git a/java/Makefile.am b/java/Makefile.am
index 4437d5d6..9580f50b 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -27,17 +27,15 @@ libjlasso_la_LDFLAGS =	-no-undefined -avoid-version -module
 javashare_DATA = lasso.jar
 
 SWIG_OUTPUTS = lasso_wrap.c \
-	AuthnRequest.java   AuthnResponse.java   Request.java  \
-	Response.java       Server.java          Identity.java \
-	Session.java        Defederation.java    Login.java    \
-	Logout.java         Lecp.java            lassoJNI.java \
-	lasso.java          lassoConstants.java  LogoutRequest.java \
-	FederationTerminationNotification.java   LogoutResponse.java \
-	Assertion.java      ProviderIds.java     Provider.java \
-	Providers.java      NameIdentifierMapping.java NameRegistration.java \
-	Node.java           RegisterNameIdentifierRequest.java \
-	RegisterNameIdentifierResponse.java      SWIGTYPE_p_void.java
-
+	Defederation.java Identity.java lassoConstants.java lasso.java \
+	lassoJNI.java Lecp.java LibAssertion.java LibAuthnRequest.java \
+	LibAuthnResponse.java LibFederationTerminationNotification.java \
+	LibLogoutRequest.java LibLogoutResponse.java \
+	LibRegisterNameIdentifierRequest.java \
+	LibRegisterNameIdentifierResponse.java Login.java Logout.java \
+	NameIdentifierMapping.java NameRegistration.java Node.java \
+	ProviderIds.java Provider.java SamlpRequest.java \
+	SamlpResponse.java Server.java Session.java SWIGTYPE_p_void.java
 
 
 JAVA_CRUFT = $(JAVA_PATH)lasso.class lasso_wrap.o lasso.jar $(JAVA_PATH)lasso.java
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index 6a09388e..d102b6b3 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -22,10 +22,10 @@ BUILT_SOURCES = types.c symbols.sym
 liblasso_la_SOURCES = lasso.c
 
 types.c:
-	python extract_types.py
+	python $(srcdir)/extract_types.py $(srcdir)
 
 symbols.sym:
-	python extract_symbols.py > symbols.sym
+	python $(srcdir)/extract_symbols.py $(srcdir) > symbols.sym
 
 clean-local:
 	-rm types.c symbols.sym
diff --git a/lasso/extract_symbols.py b/lasso/extract_symbols.py
index da8192a0..0fa7c466 100644
--- a/lasso/extract_symbols.py
+++ b/lasso/extract_symbols.py
@@ -2,9 +2,15 @@
 
 import glob
 import re
+import sys
+
+if len(sys.argv) == 2:
+    srcdir = sys.argv[1]
+else:
+    srcdir = '.'
 
 symbols = []
-for header_file in glob.glob('*/*.h') + glob.glob('*.h'):
+for header_file in glob.glob('%s/*/*.h' % srcdir) + glob.glob('%s/*.h' % srcdir):
     symbols.extend(re.findall('LASSO_EXPORT.*(lasso_[a-zA-Z_]+)', file(header_file).read()))
 
 for s in symbols:
diff --git a/lasso/extract_types.py b/lasso/extract_types.py
index 9fd7c975..a54baa0f 100644
--- a/lasso/extract_types.py
+++ b/lasso/extract_types.py
@@ -2,6 +2,12 @@
 
 import glob
 import re
+import sys
+
+if len(sys.argv) == 2:
+    srcdir = sys.argv[1]
+else:
+    srcdir = '.'
 
 fd = open('types.c', 'w')
 
@@ -10,7 +16,7 @@ print >> fd, ""
 print >> fd, "typedef GType (*type_function) (void);"
 print >> fd, ""
 
-for header_file in glob.glob('*/*.h'):
+for header_file in glob.glob('%s/*/*.h' % srcdir):
     try:
         type = re.findall('lasso_.*get_type', open(header_file).read())[0]
     except IndexError:
@@ -19,7 +25,7 @@ for header_file in glob.glob('*/*.h'):
 
 print >> fd, ""
 print >> fd, "type_function functions[] = {"
-for header_file in glob.glob('*/*.h'):
+for header_file in glob.glob('%s/*/*.h' % srcdir):
     try:
         type = re.findall('lasso_.*get_type', open(header_file).read())[0]
     except IndexError:
diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index 6eb41792..a001a61c 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -79,11 +79,12 @@ liblasso_xml_la_SOURCES = \
 	samlp_response_abstract.c \
 	samlp_status.c \
 	samlp_status_code.c \
-	utility_status.c
+	utility_status.c \
+	tools.h \
+	internals.h
 
 liblassoinclude_HEADERS = \
 	strings.h \
-	tools.h \
 	errors.h \
 	xml.h	\
 	disco_credentials.h \
diff --git a/php/Attic/examples/sample-idp/Makefile.am b/php/Attic/examples/sample-idp/Makefile.am
index 9837e367..5f2818fb 100644
--- a/php/Attic/examples/sample-idp/Makefile.am
+++ b/php/Attic/examples/sample-idp/Makefile.am
@@ -1,21 +1,21 @@
 EXTRA_DIST = \
 	admin_user.php \
+	cancel_federation.php \
 	create_metadata.php \
 	defederate.php \
 	edit_metadata.php \
 	federate.php \
 	index.php \
+	log_view.php \
 	login.php \
 	logout.php \
+	metadata_idp1.xml \
+	metadata_sp1.xml \
+	misc.php \
+	session.php \
 	setup.php \
 	singleSignOn.php \
 	soapEndpoint.php \
 	user_add.php \
-	idp_certificate.pem \
-	idp_metadata.xml \
-	idp_private-key-raw.pem \
-	idp_public-key.pem \
-	sp1_certificate.pem \
-	sp1_metadata.xml \
-	sp1_public-key.pem \
+	view_session.php \
 	README
diff --git a/php/Attic/examples/sample-sp/Makefile.am b/php/Attic/examples/sample-sp/Makefile.am
index cf6f1b5f..cdfc650e 100644
--- a/php/Attic/examples/sample-sp/Makefile.am
+++ b/php/Attic/examples/sample-sp/Makefile.am
@@ -1,16 +1,17 @@
 EXTRA_DIST = \
 	admin_user.php \
 	assertionConsumer.php \
-	idp_certificate.pem \
-	idp_metadata.xml \
-	idp_public-key.pem \
+	cancel_federation.php \
 	index.php \
 	login.php \
 	logout.php \
+	metadata_idp1.xml \
+	metadata_sp1.xml \
+	misc.php \
 	register.php \
+	session.php \
 	setup.php \
-	sp_certificate.pem \
-	sp_metadata.xml \
-	sp_private-key-raw.pem \
-	sp_public-key.pem \
+	soapEndpoint.php \
+	view_session.php \
 	README
+
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 73cbbd32..d3307b6e 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -763,7 +763,7 @@ gchar* LassoNode_dump(LassoNode *self) {
 
 
 #ifndef SWIGPHP4
-%rename(Assertion) LassoLibAssertion;
+%rename(LibAssertion) LassoLibAssertion;
 #endif
 typedef struct {
 	%extend {
@@ -806,7 +806,7 @@ gchar* LassoLibAssertion_dump(LassoLibAssertion *self) {
 
 
 #ifndef SWIGPHP4
-%rename(AuthnRequest) LassoLibAuthnRequest;
+%rename(LibAuthnRequest) LassoLibAuthnRequest;
 #endif
 %nodefault LassoLibAuthnRequest;
 typedef struct {
@@ -993,7 +993,7 @@ void LassoLibLogoutRequest_relayState_set(LassoLibLogoutRequest *self, char *rel
 
 
 #ifndef SWIGPHP4
-%rename(LogoutResponse) LassoLibLogoutResponse;
+%rename(LibLogoutResponse) LassoLibLogoutResponse;
 #endif
 %nodefault LassoLibLogoutResponse;
 typedef struct {
@@ -1082,7 +1082,7 @@ void LassoLibRegisterNameIdentifierRequest_relayState_set(
 
 
 #ifndef SWIGPHP4
-%rename(RegisterNameIdentifierResponse) LassoLibRegisterNameIdentifierResponse;
+%rename(LibRegisterNameIdentifierResponse) LassoLibRegisterNameIdentifierResponse;
 #endif
 %nodefault LassoLibRegisterNameIdentifierResponse;
 typedef struct {