From 933458c0681e9d50031d9130f352accdbce1a4e4 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 27 May 2008 15:27:30 +0000 Subject: [PATCH] add Makefile.in to MAINTAINERCLEANFILES in every Makefile.am --- Makefile.am | 9 +++++++++ bindings/Makefile.am | 1 + bindings/java/Makefile.am | 1 + bindings/php4/Makefile.am | 1 + bindings/php5/Makefile.am | 1 + bindings/php5/examples/Makefile.am | 1 + bindings/php5/tests/Makefile.am | 1 + bindings/python/Makefile.am | 1 + bindings/python/tests/Makefile.am | 1 + csharp/Makefile.am | 2 +- docs/Makefile.am | 1 + docs/lasso-book/Makefile.am | 1 + docs/lasso-book/figures/Makefile.am | 1 + docs/reference/Makefile.am | 1 + java/Makefile.am | 2 +- lasso/Makefile.am | 1 + lasso/id-ff/Makefile.am | 1 + lasso/id-wsf-2.0/Makefile.am | 1 + lasso/id-wsf/Makefile.am | 1 + lasso/saml-2.0/Makefile.am | 1 + lasso/xml/Makefile.am | 1 + lasso/xml/id-wsf-2.0/Makefile.am | 1 + lasso/xml/saml-2.0/Makefile.am | 1 + lasso/xml/ws/Makefile.am | 1 + perl/Makefile.am | 2 +- php/Makefile.am | 2 +- php5/Makefile.am | 2 +- python/Makefile.am | 2 +- python/tests/Makefile.am | 1 + swig/Makefile.am | 1 + swig/id-wsf-2.0/Makefile.am | 1 + swig/saml-2.0/Makefile.am | 1 + swig/ws/Makefile.am | 1 + tests/Makefile.am | 1 + tests/data/Makefile.am | 1 + tests/data/ca1-la/Makefile.am | 1 + tests/data/idp1-la/Makefile.am | 1 + tests/data/idp5-saml2/Makefile.am | 1 + tests/data/lecp1-la/Makefile.am | 1 + tests/data/sp1-la/Makefile.am | 1 + tests/data/sp5-saml2/Makefile.am | 1 + tests/data/sp6-saml2/Makefile.am | 1 + tests/metadata/Makefile.am | 1 + win32/Makefile.am | 1 + win32/msvc/Makefile.am | 1 + win32/msvc/java/Makefile.am | 1 + win32/msvc/php/Makefile.am | 1 + win32/msvc/python/Makefile.am | 1 + win32/nsis/Makefile.am | 1 + 49 files changed, 57 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index eee2cba2..1b46c8f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,15 @@ SUBDIRS = lasso \ EXTRA_DIST = COPYING lasso.pc.in lasso-src-config.in +MAINTAINERCLEANFILES = \ + Makefile.in \ + config.guess \ + config.sub \ + configure \ + install-sh \ + missing + + pkgconfig_DATA = lasso.pc pkgconfigdir = $(libdir)/pkgconfig diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 83c29d18..dbf3d085 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = python php5 java CLEANFILES = bindings.pyc lang_java.pyc lang_python.pyc lang_php5.pyc \ diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 83a33a1e..d4403ed9 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if JAVA_ENABLED INCLUDES = \ -I$(top_builddir) \ diff --git a/bindings/php4/Makefile.am b/bindings/php4/Makefile.am index 71a87867..c700dc28 100644 --- a/bindings/php4/Makefile.am +++ b/bindings/php4/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = if PHP4_ENABLED diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am index acaafb9b..62ec83ca 100644 --- a/bindings/php5/Makefile.am +++ b/bindings/php5/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = examples if PHP5_ENABLED diff --git a/bindings/php5/examples/Makefile.am b/bindings/php5/examples/Makefile.am index 731cee07..8488755b 100644 --- a/bindings/php5/examples/Makefile.am +++ b/bindings/php5/examples/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = get_attributes_from_assertion.php diff --git a/bindings/php5/tests/Makefile.am b/bindings/php5/tests/Makefile.am index 68638d5d..9b2a353d 100644 --- a/bindings/php5/tests/Makefile.am +++ b/bindings/php5/tests/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if PHP5_ENABLED TESTS = profile_tests.sh binding_tests.sh endif diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 65aa3804..3da0e08a 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = tests if PYTHON_ENABLED diff --git a/bindings/python/tests/Makefile.am b/bindings/python/tests/Makefile.am index 852f3f73..f465d298 100644 --- a/bindings/python/tests/Makefile.am +++ b/bindings/python/tests/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if PYTHON_ENABLED TESTS = profiles_tests.py binding_tests.py endif diff --git a/csharp/Makefile.am b/csharp/Makefile.am index 2c569b1b..09b9f9da 100644 --- a/csharp/Makefile.am +++ b/csharp/Makefile.am @@ -126,5 +126,5 @@ endif EXTRA_DIST = lasso-sharp.pc.in lasso.dll.config AssemblyInfo.cs lasso-sharp.snk \ $(SWIG_FILES) $(SWIG_WSF_FILES) -MAINTAINERCLEANFILES = $(SWIG_FILES) $(SWIG_WSF_FILES) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_FILES) $(SWIG_WSF_FILES) diff --git a/docs/Makefile.am b/docs/Makefile.am index b2c5627c..53abc74c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if GTK_DOC_ENABLED GTK_DOC_SD = reference endif diff --git a/docs/lasso-book/Makefile.am b/docs/lasso-book/Makefile.am index 33421f94..a4aebf38 100644 --- a/docs/lasso-book/Makefile.am +++ b/docs/lasso-book/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if HAVE_INKSCAPE if HAVE_XSLTPROC SUBDIRS = figures diff --git a/docs/lasso-book/figures/Makefile.am b/docs/lasso-book/figures/Makefile.am index fa788652..aeb1616f 100644 --- a/docs/lasso-book/figures/Makefile.am +++ b/docs/lasso-book/figures/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in figuresdir = $(datadir)/doc/lasso/figures FIGURES_PNG_FILES = \ diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 643e47c6..410ce922 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ lasso-sections.txt \ lasso.sgml \ diff --git a/java/Makefile.am b/java/Makefile.am index 7ae408b0..10913c3c 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -200,7 +200,7 @@ JAVA_CRUFT = $(JAVA_PATH)lasso.class lasso_wrap.o lasso.jar $(JAVA_PATH)lasso.ja EXTRA_DIST = $(SWIG_OUTPUTS) $(SWIG_WSF_OUTPUTS) CLEANFILES = $(JAVA_CRUFT) -MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) $(SWIG_WSF_OUTPUTS) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_OUTPUTS) $(SWIG_WSF_OUTPUTS) SWIG_I_FILES=$(shell find $(top_srcdir)/swig/ -name '*.[ih]') lasso_wrap.c lasso.java: $(SWIG_I_FILES) diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 8d5d7084..07cc8a81 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = xml id-ff id-wsf saml-2.0 id-wsf-2.0 liblassoincludedir = $(includedir)/lasso diff --git a/lasso/id-ff/Makefile.am b/lasso/id-ff/Makefile.am index 25dcce9f..0f20b02c 100644 --- a/lasso/id-ff/Makefile.am +++ b/lasso/id-ff/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-ff INCLUDES = \ diff --git a/lasso/id-wsf-2.0/Makefile.am b/lasso/id-wsf-2.0/Makefile.am index 062f8854..004ccfb8 100644 --- a/lasso/id-wsf-2.0/Makefile.am +++ b/lasso/id-wsf-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-wsf-2.0 INCLUDES = \ diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am index fa64e733..b247e1a2 100644 --- a/lasso/id-wsf/Makefile.am +++ b/lasso/id-wsf/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-wsf INCLUDES = \ diff --git a/lasso/saml-2.0/Makefile.am b/lasso/saml-2.0/Makefile.am index 6182d1cd..1ac03059 100644 --- a/lasso/saml-2.0/Makefile.am +++ b/lasso/saml-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/saml-2.0 INCLUDES = \ diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am index 34d9d080..1fcaab56 100644 --- a/lasso/xml/Makefile.am +++ b/lasso/xml/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = saml-2.0 id-wsf-2.0 ws liblassoincludedir = $(includedir)/lasso/xml diff --git a/lasso/xml/id-wsf-2.0/Makefile.am b/lasso/xml/id-wsf-2.0/Makefile.am index b31e56a7..a8ad0a77 100644 --- a/lasso/xml/id-wsf-2.0/Makefile.am +++ b/lasso/xml/id-wsf-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/id-wsf-2.0 INCLUDES = \ diff --git a/lasso/xml/saml-2.0/Makefile.am b/lasso/xml/saml-2.0/Makefile.am index da7316ae..c9a703c5 100644 --- a/lasso/xml/saml-2.0/Makefile.am +++ b/lasso/xml/saml-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/saml-2.0 INCLUDES = \ diff --git a/lasso/xml/ws/Makefile.am b/lasso/xml/ws/Makefile.am index 32e31c5f..1d6ae5c5 100644 --- a/lasso/xml/ws/Makefile.am +++ b/lasso/xml/ws/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/ws INCLUDES = \ diff --git a/perl/Makefile.am b/perl/Makefile.am index 2db07dd7..ad554064 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -51,7 +51,7 @@ SWIG_OUTPUTS = lasso_wrap.c lasso.pm EXTRA_DIST = $(SWIG_OUTPUTS) Makefile.PL # Maintainer clean the swig generated files, because he/she maintains them. -MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_OUTPUTS) clean-local: rm -rf blib $(PERL_MAKEFILE) $(PERL_MAKEFILE).old build-perl-stamp $(PERL_CRUFT) diff --git a/php/Makefile.am b/php/Makefile.am index 7db52efc..ba2c6145 100644 --- a/php/Makefile.am +++ b/php/Makefile.am @@ -18,7 +18,7 @@ lasso_wrap.c php_lasso.h lasso.php: $(SWIG_I_FILES) test-php: lasso.la lasso.php $(PHP4) -d extension_dir=.libs $(srcdir)/lasso.php -MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_OUTPUTS) EXTRA_DIST = patch_swig_output.py $(SWIG_OUTPUTS) clean-local: diff --git a/php5/Makefile.am b/php5/Makefile.am index 151de566..ec7aa8e2 100644 --- a/php5/Makefile.am +++ b/php5/Makefile.am @@ -15,6 +15,6 @@ lasso_wrap.c php_lasso.h lasso.php: $(SWIG_I_FILES) test-php: lasso.la lasso.php $(PHP5) -d extension_dir=.libs $(srcdir)/lasso.php -MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_OUTPUTS) EXTRA_DIST = $(SWIG_OUTPUTS) diff --git a/python/Makefile.am b/python/Makefile.am index 703187b8..e99b9bf5 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -42,4 +42,4 @@ clean-local: EXTRA_DIST = $(SWIG_OUTPUTS) # Maintainer clean the swig generated files, because he/she maintains them. -MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) +MAINTAINERCLEANFILES = Makefile.in $(SWIG_OUTPUTS) diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index cddb9666..eb7dd41f 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = tests.py login_tests.py idwsf2_tests.py diff --git a/swig/Makefile.am b/swig/Makefile.am index d862c411..75a7a295 100644 --- a/swig/Makefile.am +++ b/swig/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = Lasso.i Lasso-wsf.i Lasso-wsf-disco.i Lasso-wsf-dst.i \ Lasso-wsf-is.i Lasso-wsf-sa.i Lasso-wsf-soap.i inheritance.h \ diff --git a/swig/id-wsf-2.0/Makefile.am b/swig/id-wsf-2.0/Makefile.am index 67c4729d..277f87c2 100644 --- a/swig/id-wsf-2.0/Makefile.am +++ b/swig/id-wsf-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ inheritance.h \ main.h \ diff --git a/swig/saml-2.0/Makefile.am b/swig/saml-2.0/Makefile.am index 42378f89..98fc25dd 100644 --- a/swig/saml-2.0/Makefile.am +++ b/swig/saml-2.0/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ inheritance.h \ diff --git a/swig/ws/Makefile.am b/swig/ws/Makefile.am index b44f52c7..d4de740c 100644 --- a/swig/ws/Makefile.am +++ b/swig/ws/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ inheritance.h \ main.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 1931511b..421a4d62 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in if WITH_TESTS TESTS = tests diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 7b5dc176..0932183f 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = ca1-la idp1-la lecp1-la sp1-la idp5-saml2 sp5-saml2 sp6-saml2 EXTRA_DIST = sample-identity-dump-1.xml diff --git a/tests/data/ca1-la/Makefile.am b/tests/data/ca1-la/Makefile.am index 5fdef586..344664f1 100644 --- a/tests/data/ca1-la/Makefile.am +++ b/tests/data/ca1-la/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = certificate.pem jks.keystore diff --git a/tests/data/idp1-la/Makefile.am b/tests/data/idp1-la/Makefile.am index cfa52815..45782b12 100644 --- a/tests/data/idp1-la/Makefile.am +++ b/tests/data/idp1-la/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem diff --git a/tests/data/idp5-saml2/Makefile.am b/tests/data/idp5-saml2/Makefile.am index 61de69a7..adcdf09d 100644 --- a/tests/data/idp5-saml2/Makefile.am +++ b/tests/data/idp5-saml2/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = metadata.xml private-key.pem diff --git a/tests/data/lecp1-la/Makefile.am b/tests/data/lecp1-la/Makefile.am index 0f538dc9..2cc7eacb 100644 --- a/tests/data/lecp1-la/Makefile.am +++ b/tests/data/lecp1-la/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = certificate.pem jks.keystore Makefile.am metadata.xml private-key-raw.pem public-key.pem diff --git a/tests/data/sp1-la/Makefile.am b/tests/data/sp1-la/Makefile.am index cfa52815..45782b12 100644 --- a/tests/data/sp1-la/Makefile.am +++ b/tests/data/sp1-la/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem diff --git a/tests/data/sp5-saml2/Makefile.am b/tests/data/sp5-saml2/Makefile.am index 61de69a7..adcdf09d 100644 --- a/tests/data/sp5-saml2/Makefile.am +++ b/tests/data/sp5-saml2/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = metadata.xml private-key.pem diff --git a/tests/data/sp6-saml2/Makefile.am b/tests/data/sp6-saml2/Makefile.am index 61de69a7..adcdf09d 100644 --- a/tests/data/sp6-saml2/Makefile.am +++ b/tests/data/sp6-saml2/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = metadata.xml private-key.pem diff --git a/tests/metadata/Makefile.am b/tests/metadata/Makefile.am index ce21c415..40d4798b 100644 --- a/tests/metadata/Makefile.am +++ b/tests/metadata/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ metadata_01.xml \ metadata_02.xml \ diff --git a/win32/Makefile.am b/win32/Makefile.am index b5a41628..d5025271 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = nsis msvc EXTRA_DIST = lasso.rc lasso.rc.in diff --git a/win32/msvc/Makefile.am b/win32/msvc/Makefile.am index 852b11ae..b3c2c268 100644 --- a/win32/msvc/Makefile.am +++ b/win32/msvc/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = php python java EXTRA_DIST = lasso.dsp lasso.dsp.in lasso.dsw lasso_config.h.in lasso_config.h diff --git a/win32/msvc/java/Makefile.am b/win32/msvc/java/Makefile.am index 19d18b7c..8129bcdb 100644 --- a/win32/msvc/java/Makefile.am +++ b/win32/msvc/java/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = java.dsp diff --git a/win32/msvc/php/Makefile.am b/win32/msvc/php/Makefile.am index 2b12377b..ab12b8ba 100644 --- a/win32/msvc/php/Makefile.am +++ b/win32/msvc/php/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = php.dsp diff --git a/win32/msvc/python/Makefile.am b/win32/msvc/python/Makefile.am index a7fcc345..30d9ecac 100644 --- a/win32/msvc/python/Makefile.am +++ b/win32/msvc/python/Makefile.am @@ -1 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = python.dsp diff --git a/win32/nsis/Makefile.am b/win32/nsis/Makefile.am index 84e66ea7..6b47db6b 100644 --- a/win32/nsis/Makefile.am +++ b/win32/nsis/Makefile.am @@ -1,2 +1,3 @@ +MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = lasso-deps.nsi.in lasso-full.nsi.in jlasso-lite.nsi.in lasso-lite.nsi.in lasso.ico \ lasso-deps.nsi lasso-full.nsi jlasso-lite.nsi lasso-lite.nsi