5 files changed, 43 insertions, 28 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 32a9f65a..e6d8dc90 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = doc environs examples protocols tests xml
 
+lassomod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/lasso/.libs
+
+if WITH_PYTHON
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
 	-I$(top_srcdir) \
@@ -14,16 +17,15 @@ python_DATA = lasso.py lasso_strings.py
 
 mylibs = $(top_builddir)/lasso/liblasso.la
 
-lassomod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/lasso/.libs
 lassomod_la_SOURCES = lassomod.c  py_lasso.c  utils.c  wrap_objs.c
 lassomod_la_LIBADD = $(mylibs) \
 	./protocols/elements/libelements.a \
 	./protocols/libprotocols.a \
 	./xml/libxml.a \
 	./environs/libenvirons.a
-	
+endif
 
 EXTRA_DIST = lassomod.h  py_lasso.h  utils.h  wrap_objs.h \
-		generator_lasso_strings.py  lasso.py  lasso_strings.py
-
+		generator_lasso_strings.py  lasso.py  lasso_strings.py \
+		lassomod.c  py_lasso.c  utils.c  wrap_objs.c
 
diff --git a/python/environs/Makefile.am b/python/environs/Makefile.am
index 7b73a494..72a98510 100644
--- a/python/environs/Makefile.am
+++ b/python/environs/Makefile.am
@@ -1,5 +1,3 @@
-noinst_LIBRARIES = libenvirons.a
-
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
 	-I$(top_srcdir) \
@@ -10,7 +8,12 @@ INCLUDES = \
 	$(NULL)
 
 
-libenvirons_a_SOURCES = py_federation_termination.c py_login.c py_logout.c py_profile_context.c py_register_name_identifier.c py_server.c py_user.c
+ENVSOURCES = py_federation_termination.c py_login.c py_logout.c py_profile_context.c py_register_name_identifier.c py_server.c py_user.c
+
+if WITH_PYTHON
+noinst_LIBRARIES = libenvirons.a
+libenvirons_a_SOURCES = $(ENVSOURCES)
+endif
 
-EXTRA_DIST = py_federation_termination.h py_login.h py_logout.h py_profile_context.h py_register_name_identifier.h py_server.h py_user.h
+EXTRA_DIST = $(ENVSOURCES) py_federation_termination.h py_login.h py_logout.h py_profile_context.h py_register_name_identifier.h py_server.h py_user.h
 
diff --git a/python/protocols/Makefile.am b/python/protocols/Makefile.am
index 3401e473..da376c88 100644
--- a/python/protocols/Makefile.am
+++ b/python/protocols/Makefile.am
@@ -9,9 +9,7 @@ INCLUDES = \
 	$(PY_CFLAGS) \
 	$(NULL)
 
-noinst_LIBRARIES = libprotocols.a
-
-libprotocols_a_SOURCES = \
+PROTSOURCES = \
 	py_authn_request.c \
 	py_authn_response.c \
 	py_federation_termination_notification.c \
@@ -22,7 +20,14 @@ libprotocols_a_SOURCES = \
 	py_register_name_identifier_request.c \
 	py_register_name_identifier_response.c
 
+
+if WITH_PYTHON
+libprotocols_a_SOURCES = $(PROTSOURCES)
+noinst_LIBRARIES = libprotocols.a
+endif
+
 EXTRA_DIST = \
+	$(PROTSOURCES) \
 	py_authn_request.h \
 	py_authn_response.h \
 	py_federation_termination_notification.h \
diff --git a/python/protocols/elements/Makefile.am b/python/protocols/elements/Makefile.am
index 047fede8..977c8b67 100644
--- a/python/protocols/elements/Makefile.am
+++ b/python/protocols/elements/Makefile.am
@@ -1,4 +1,9 @@
+ELEMSOURCES = py_assertion.c py_authentication_statement.c
+
+if WITH_PYTHON
 noinst_LIBRARIES = libelements.a
+libelements_a_SOURCES = $(ELEMSOURCES)
+endif
 
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
@@ -9,7 +14,5 @@ INCLUDES = \
 	$(PY_CFLAGS) \
 	$(NULL)
 
-noinst_LIBRARIES = libelements.a
-libelements_a_SOURCES = py_assertion.c py_authentication_statement.c
 
-EXTRA_DIST = py_assertion.h py_authentication_statement.h
+EXTRA_DIST = $(ELEMSOURCES) py_assertion.h py_authentication_statement.h
diff --git a/python/xml/Makefile.am b/python/xml/Makefile.am
index 9a3fffed..7b6692b4 100644
--- a/python/xml/Makefile.am
+++ b/python/xml/Makefile.am
@@ -1,17 +1,4 @@
-noinst_LIBRARIES = libxml.a
-
-INCLUDES = \
-	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lasso \
-	$(LASSO_DEFINES) \
-	$(LASSO_CFLAGS) \
-	$(PY_CFLAGS) \
-	$(NULL)
-
-noinst_LIBRARIES = libxml.a
-
-libxml_a_SOURCES = \
+XMLSOURCES = \
 	py_lib_authentication_statement.c \
 	py_lib_authn_request.c \
 	py_lib_federation_termination_notification.c \
@@ -26,7 +13,22 @@ libxml_a_SOURCES = \
 	py_samlp_response.c \
 	py_xml.c
 
+if WITH_PYTHON
+noinst_LIBRARIES = libxml.a
+libxml_a_SOURCES = $(XMLSOURCES)
+endif
+
+INCLUDES = \
+	-DPACKAGE=\"@PACKAGE@\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/lasso \
+	$(LASSO_DEFINES) \
+	$(LASSO_CFLAGS) \
+	$(PY_CFLAGS) \
+	$(NULL)
+
 EXTRA_DIST = \
+	$(XMLSOURCES) \
 	py_lib_authentication_statement.h \
 	py_lib_authn_request.h \
 	py_lib_federation_termination_notification.h \