Commit 87a8fb954d0b4d0305fd3aacdd5b9ade2e88242a

sammy 2010-05-23T17:50:57

Remove additional files upon make maintainer-clean. Fix courtesy of Bullet Catcher, from SF patch #2039757.

diff --git a/Makefile.am b/Makefile.am
index ff03311..2ac07fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ftgl.pc
 
 DISTCLEANFILES = ftgl.pc
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in config.h.in~
 
 EXTRA_DIST = \
 	AUTHORS \
@@ -39,6 +40,9 @@ all-local:
 	fi
 	@$(ECHO)
 
+maintainer-clean-local:
+	-rm -rf .auto
+
 # Upload documentation
 DOC = docs/html docs/latex/ftgl.pdf
 HOST = ftgl.sf.net
diff --git a/demo/Makefile.am b/demo/Makefile.am
index 2817d8c..c1121e2 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -41,4 +41,6 @@ FTGLMFontDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
 FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
 FTGLMFontDemo_LDADD = ../src/libftgl.la
 
+MAINTAINERCLEANFILES = Makefile.in
+
 NULL =
diff --git a/docs/Makefile.am b/docs/Makefile.am
index eea2744..25f98a4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -69,4 +69,6 @@ EXTRA_DIST = \
 	images/metrics.svg \
 	$(NULL)
 
+MAINTAINERCLEANFILES = Makefile.in
+
 NULL =
diff --git a/msvc/Makefile.am b/msvc/Makefile.am
index e77c71b..f114a5f 100644
--- a/msvc/Makefile.am
+++ b/msvc/Makefile.am
@@ -35,4 +35,6 @@ vc9_files = \
     vc9/trackball.vcproj \
     $(NULL)
 
+MAINTAINERCLEANFILES = Makefile.in
+
 NULL =
diff --git a/src/Makefile.am b/src/Makefile.am
index 731d364..e7eb15b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,4 +119,6 @@ ftlayout_sources = \
     FTLayout/FTSimpleLayoutImpl.h \
     $(NULL)
 
+MAINTAINERCLEANFILES = Makefile.in
+
 NULL =
diff --git a/test/Makefile.am b/test/Makefile.am
index 487aa96..61c4317 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -70,5 +70,7 @@ CTest_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
 CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
 CTest_LDADD = ../src/libftgl.la
 
+MAINTAINERCLEANFILES = Makefile.in
+
 NULL =