diff options
| author | Daniel Elstner <daniel.kitta@gmail.com> | 2009-08-16 15:35:00 +0200 |
|---|---|---|
| committer | Daniel Elstner <daniel.kitta@gmail.com> | 2009-08-16 15:35:00 +0200 |
| commit | 4734a46ec3e4c06841335044318104ad46896891 (patch) | |
| tree | 7f6142fd9ca96f0217bba331d9de5ae5ba4c48b3 | |
| parent | f7c30bd5ea0638be26b357d4e9bb03d3aa04b3d1 (diff) | |
| download | glibmm-4734a46ec3e4c06841335044318104ad46896891.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 10 |
2 files changed, 15 insertions, 6 deletions
@@ -1,5 +1,16 @@ 2009-08-16 Daniel Elstner <daniel.kitta@gmail.com> + 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. + +2009-08-16 Daniel Elstner <daniel.kitta@gmail.com> + Provide g{lib,io}mm-2.4-uninstalled.pc files * glib/glibmm-2.4-uninstalled.pc.in: New file to provide a pkg-config 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 |