diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 6ddb2c67..4cc87582 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,34 +1,25 @@
-TOP=$(top_srcdir)
-DOC_MAIN_SGML_FILE=lasso.sgml
-SOURCE_DIR=$(TOP)/lasso
-INCLUDE_DIR=$(TOP)/lasso
-
 EXTRA_DIST = \
 	lasso-sections.txt \
 	lasso.sgml \
 	lasso.types 
 
-# Extra options to pass to gtkdoc-scangobj.
-SCANOBJ_OPTIONS=
-
-#
 # We need to pre-process original source files
 # because gtkdoc does not understand some C features
 #
-DOC_SOURCE_DIR=./code
-DOC_SOURCE_FILES=\
-	$(shell find $(SOURCE_DIR) -name '*.c' -print ) \
-	$(shell find $(INCLUDE_DIR) -name '*.h' -print )
+DOC_SOURCE_DIR = ./code
+DOC_SOURCE_FILES = \
+	$(shell find $(top_srcdir)/lasso -name '*.c' -print ) \
+	$(shell find $(top_srcdir)/lasso -name '*.h' -print )
 
 # do nothing for all
 all: docs
 
 docs: sgml html clean-sources
 
-html: sgml $(DOC_MAIN_SGML_FILE) lasso-index
+html: sgml lasso.sgml lasso-index
 	@echo '*** Building HTML ***'
 	test -d html || mkdir html
-	cd html && gtkdoc-mkhtml lasso ../build/$(DOC_MAIN_SGML_FILE)
+	cd html && gtkdoc-mkhtml lasso ../build/lasso.sgml
 
 SCANOBJ_FILES = lasso.hierarchy	lasso.signals lasso.interfaces lasso.prerequisites lasso.args
 
@@ -41,7 +32,7 @@ SCANOBJ_FILES = lasso.hierarchy	lasso.signals lasso.interfaces lasso.prerequisit
 sgml: templates
 	@echo '*** Building SGML ***'
 	cd build && gtkdoc-mkdb --module=lasso \
-		    --main-sgml-file=$(DOC_MAIN_SGML_FILE) \
+		    --main-sgml-file=lasso.sgml \
 		    --tmpl-dir=../tmpl/ \
 		    --source-dir=../$(DOC_SOURCE_DIR)/lasso \
 		    --output-dir=../sgml/
@@ -69,8 +60,8 @@ GTKDOC_LIBS = 	\
 	$(LASSO_LIBS) \
 	$(top_builddir)/lasso/liblasso.la
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC)
 
 scan: doc_sources
 	test -d build || mkdir build
@@ -94,7 +85,7 @@ scan: doc_sources
 doc_sources: $(DOC_SOURCE_FILES)
 	@echo '*** Prepare sources ***'
 	(for i in $(DOC_SOURCE_FILES) ; do \
-	    folder_name=`echo $$i | sed 's#$(TOP)/##' | sed 's#/[^/]*$$##'`; \
+	    folder_name=`echo $$i | sed 's#$(top_srcdir)/##' | sed 's#/[^/]*$$##'`; \
 	    file_name=`echo $$i | sed 's#.*/##'`; \
 	    test -d $(DOC_SOURCE_DIR)/$$folder_name || mkdir -p $(DOC_SOURCE_DIR)/$$folder_name; \
 	    cat $$i | \
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index 6adee84b..97a3921c 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -2,10 +2,7 @@ SUBDIRS = xml protocols environs
 
 liblassoincludedir = $(includedir)/lasso
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	$(LASSO_DEFINES) \
-	$(LASSO_CFLAGS)
+INCLUDES = -I$(top_srcdir) $(LASSO_DEFINES) $(LASSO_CFLAGS)
 
 ## Added to activate libtool 1.5.6 windows resources partial support
 LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \
diff --git a/lasso/id-ff/Makefile.am b/lasso/id-ff/Makefile.am
index 33001c1a..c9c7e99a 100644
--- a/lasso/id-ff/Makefile.am
+++ b/lasso/id-ff/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = 
-
 liblassoincludedir = $(includedir)/lasso/environs
 
 INCLUDES = \
diff --git a/php/Attic/examples/Makefile.am b/php/Attic/examples/Makefile.am
index 8f1a498a..79505f8d 100644
--- a/php/Attic/examples/Makefile.am
+++ b/php/Attic/examples/Makefile.am
@@ -1 +1 @@
-SUBDIRS=sample-sp sample-idp
+SUBDIRS = sample-sp sample-idp
diff --git a/php/Attic/examples/sample-idp/Makefile.am b/php/Attic/examples/sample-idp/Makefile.am
index 3fe42f04..29829c24 100644
--- a/php/Attic/examples/sample-idp/Makefile.am
+++ b/php/Attic/examples/sample-idp/Makefile.am
@@ -1,11 +1,5 @@
-EXTRA_DIST= admin_user.php\
-  create_metadata.php \
-  defederate.php \
-  federate.php \
-  index.php \
-  login.php \
-  logout.php \
-  setup.php \
-  singleSignOn.php \
-  soapEndpoint.php \
-  user_add.php
+EXTRA_DIST = admin_user.php create_metadata.php defederate.php \
+	     federate.php index.php login.php \
+	     logout.php setup.php singleSignOn.php \
+	     soapEndpoint.php user_add.php
+
diff --git a/php/Attic/examples/sample-sp/Makefile.am b/php/Attic/examples/sample-sp/Makefile.am
index 048d44d6..cbb7aa73 100644
--- a/php/Attic/examples/sample-sp/Makefile.am
+++ b/php/Attic/examples/sample-sp/Makefile.am
@@ -1,9 +1,4 @@
-EXTRA_DIST= admin_user.php \
-            index.php \
-            logout.php \
-            setup.php \
-            README \
-            assertionConsumer.php \
-            login.php \
-            register.php
+EXTRA_DIST = admin_user.php index.php logout.php \
+             setup.php README assertionConsumer.php \
+             login.php register.php
 
diff --git a/php/Makefile.am b/php/Makefile.am
index 429740e0..1c37eb74 100644
--- a/php/Makefile.am
+++ b/php/Makefile.am
@@ -14,6 +14,6 @@ lasso_wrap.c php_lasso.h lasso.php: $(top_srcdir)/swig/Lasso.i
 test-php: lasso.la lasso.php
 	$(PHP) -d extension_dir=.libs $(srcdir)/lasso.php
 
-MAINTAINERCLEANFILES=$(SWIG_OUTPUTS)
-EXTRA_DIST=$(SWIG_OUTPUTS)
-SUBDIRS=examples
+MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
+EXTRA_DIST = $(SWIG_OUTPUTS)
+SUBDIRS = examples
diff --git a/python/doc/.cvsignore b/python/doc/.cvsignore
new file mode 100644
index 00000000..22a4e729
--- /dev/null
+++ b/python/doc/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
diff --git a/python/doc/tutorial/.cvsignore b/python/doc/tutorial/.cvsignore
new file mode 100644
index 00000000..22a4e729
--- /dev/null
+++ b/python/doc/tutorial/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+