From 7fc5ffc10560a87699b319a9c9d65941cf557343 Mon Sep 17 00:00:00 2001
From: David Pirotte <address@hidden>
Date: Wed, 17 Aug 2016 22:59:04 -0300
Subject: [PATCH 06/11] Fixing Makefile.am

* Makefile.am:  Adding to EXTRA_DIST, new 'distclean-local:' target,
  removing the 'env:' target, configure.ac handles that now.
---
 Makefile.am | 93 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c52d37f..af0de80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,31 @@
-# guile-cairo
-# Copyright (C) 2007,2011  Andy Wingo <address@hidden>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-SUBDIRS = guile-cairo cairo examples tests doc
-
-env: Makefile env.in
-	sed -e "s|@top_srcdir\@|$(shell cd $(top_srcdir) && pwd)|" \
-	    $(srcdir)/env.in > env
-	chmod +x env
-
-BUILT_SOURCES = env
-CLEANFILES = env
+
+####
+#### Guile-Cairo
+#### Copyright (C) 2007, 2011  Andy Wingo <address@hidden>
+#### Copyright (C) 2016 David Pirotte <david at altosw dot be>
+
+#### This program is free software: you can redistribute it and/or
+#### modify it under the terms of the GNU Lesser General Public
+#### License as published by the Free Software Foundation, either
+#### version 3 of the License, or (at your option) any later version.
+
+#### This program is distributed in the hope that it will be useful,
+#### but WITHOUT ANY WARRANTY; without even the implied warranty of
+#### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#### Lesser General Public License for more details.
+
+#### You should have received a copy of the GNU Lesser General Public
+#### License along with this program.  If not, see
+#### <http://www.gnu.org/licenses/>.
+####
+
+
+SUBDIRS = \
+	guile-cairo	\
+	cairo		\
+	examples	\
+	tests		\
+	doc
 
 scmdir=$(prefix)/share/guile/site
 
@@ -44,4 +46,41 @@ gen-ChangeLog:
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
 
-EXTRA_DIST = env.in autogen.sh HACKING COPYING.LESSER $(scm_DATA)
+EXTRA_DIST = \
+	AUTHORS			\
+	ChangeLog		\
+	ChangeLog.2007		\
+	COPYING			\
+	COPYING.LESSER		\
+	HACKING			\
+	INSTALL			\
+	NEWS			\
+	README			\
+	env.in			\
+	guile-cairo.pc.in	\
+	$(wildcard am/*)	\
+	$(wildcard m4/*)	\
+	$(scm_DATA)
+
+distclean-local:
+	rm -f Makefile.in
+	rm -f aclocal.m4
+	rm -rf autom4te.cache
+	rm -rf build-aux
+	rm -f configure
+	rm -f *~
+	rm -f guile-cairo-*.tar.gz
+	rm -f guile-cairo-*.tar.gz.sig
+	rm -rf doc/guile-caito
+	rm -rf doc/guile-caito.html
+	rm -f doc/*.info
+	rm -f doc/*.pdf
+	rm -f doc/*~
+	rm -f doc/*.aux doc/*.cp doc/*.cps doc/*.fn doc/*.fns doc/*.ky
+	rm -f doc/*.log doc/*.pg doc/*.toc doc/*.tp doc/*.vr doc/*.vrs
+	rm -f doc/Makefile.in
+	rm -f doc/stamp-vti
+	rm -f cairo/*~
+	rm -f guile-cairo/*~
+	rm -f examples/*~
+	rm -f tests/*~
-- 
2.8.1