From 4734a46ec3e4c06841335044318104ad46896891 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Sun, 16 Aug 2009 15:35:00 +0200 Subject: Stop distributing README files manually * Makefile.am (text_files): Remove glib/README and gio/README as files named README are distributed automatically by Automake. (msvc_files): Use the more readable and safer $(addprefix ...) function of GNU make instead of a $(foo:%=prefix/%) substitution. (DISTCLEANFILES): Use $(filter %mmconfig.h,$(msvc_files)) instead of listing the generated configuration header files manually. --- Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 45ebec2c..797c027e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,16 +46,14 @@ nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).p include $(srcdir)/MSVC_Net2005/filelist.am include $(srcdir)/MSVC_Net2008/filelist.am -text_files = COPYING.tools README.SUN README.win32 glib/README gio/README -msvc_files = $(msvc_net2005_data:%=MSVC_Net2005/%) $(msvc_net2008_data:%=MSVC_Net2008/%) +text_files = COPYING.tools README.SUN README.win32 +msvc_files = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \ + $(addprefix MSVC_Net2008/,$(msvc_net2008_data)) dist_noinst_DATA = $(text_files) $(msvc_files) dist_noinst_SCRIPTS = autogen.sh -DISTCLEANFILES = MSVC_Net2005/glibmm/glibmmconfig.h \ - MSVC_Net2005/giomm/giommconfig.h \ - MSVC_Net2008/glibmm/glibmmconfig.h \ - MSVC_Net2008/giomm/giommconfig.h +DISTCLEANFILES = $(filter %mmconfig.h,$(msvc_files)) # TODO: Obsolete; remove after grace period. aclocal_macrodir = $(datadir)/aclocal -- cgit v1.2.1