The current Makefile.am are not quite correct. They put the generated files into the tarball, but not the *.in files. They also don't clean up some of the generated files.
This patch address that. It also simplifies the Makefile.amS a bit and uses a more consistent naming for the install dirs. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From b37f2a9ccf508acb962be2f8c670ecf40a59351a Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 14 Feb 2008 16:52:28 +0100 Subject: [PATCH] Clean up generated files and put *.in files in the tarball. Make sure to clean up all generated files on "make clean". Don't distribute generated files in the dist tarball, only the *.in files. Add generated files to .gitignore. Use consistend naming for the install dirs. --- pm/Makefile.am | 9 ++++----- src/.gitignore | 1 + src/Makefile.am | 46 +++++++++++++++++----------------------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/pm/Makefile.am b/pm/Makefile.am index 40617bd..8429347 100644 --- a/pm/Makefile.am +++ b/pm/Makefile.am @@ -3,22 +3,21 @@ SUBDIRS = \ power.d \ module.d -extradir = $(libdir)/pm-utils +pm_libdir = $(libdir)/pm-utils pm_sysconfdir = $(sysconfdir)/pm -extra_SCRIPTS = \ +pm_lib_SCRIPTS = \ functions \ defaults CLEANFILES = functions -EXTRA_DIST = \ - $(extra_SCRIPTS) +EXTRA_DIST = functions.in defaults install-exec-local: -mkdir $(DESTDIR)$(sysconfdir)/pm/config.d -do_subst = sed -e 's,[EMAIL PROTECTED]@],$(extradir),g' \ +do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_libdir),g' \ -e 's,[EMAIL PROTECTED]@],$(pm_sysconfdir),g' SUFFIXES = .in diff --git a/src/.gitignore b/src/.gitignore index 208cd72..3418ee9 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -2,6 +2,7 @@ .libs *.o pm-action +pm-is-supported pm-pmu pm-powersave pm-reset-swap diff --git a/src/Makefile.am b/src/Makefile.am index 0497c86..f43309b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,38 +1,32 @@ -pm_utils_libdir = $(libdir)/pm-utils -pm_utils_bindir = $(pm_utils_libdir)/bin +pm_libdir = $(libdir)/pm-utils +pm_bindir = $(pm_libdir)/bin pm_sysconfdir = $(sysconfdir)/pm -pm_utils_bin_PROGRAMS = \ +pm_bin_PROGRAMS = \ pm-pmu \ pm-reset-swap -pm_utils_bin_SCRIPTS = \ - pm-action - -pm_utils_usr_bindir = $(bindir) - -pm_utils_usr_bin_SCRIPTS = \ - pm-is-supported - pm_pmu_SOURCES = \ pm-pmu.c pm_reset_swap_SOURCES = \ pm-reset-swap.c -extradir = $(sbindir) - -extra_SCRIPTS = \ - pm-powersave - -acpowerdir = $(bindir) +pm_bin_SCRIPTS = \ + pm-action -acpower_SCRIPTS = \ +bin_SCRIPTS = \ + pm-is-supported \ on_ac_power -CLEANFILES = $(pm_utils_bin_SCRIPTS) $(extra_SCRIPTS) +sbin_SCRIPTS = \ + pm-powersave + +CLEANFILES = pm-action pm-is-supported pm-powersave -do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_utils_libdir),g' \ +EXTRA_DIST = pm-action.in pm-is-supported.in pm-powersave.in on_ac_power + +do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_libdir),g' \ -e 's,[EMAIL PROTECTED]@],$(pm_sysconfdir),g' SUFFIXES = .in @@ -43,15 +37,9 @@ SUFFIXES = .in install-data-hook: -mkdir -p $(DESTDIR)$(sbindir) - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-hibernate - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend-hybrid - -EXTRA_DIST = \ - $(extra_SCRIPTS) \ - $(acpower_SCRIPTS) \ - $(pm_utils_bin_SCRIPTS) \ - $(pm_utils_usr_bin_SCRIPTS) + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-hibernate + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend-hybrid clean-local : rm -f *~ -- 1.5.4.1
_______________________________________________ Pm-utils mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pm-utils
