aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-04-29 15:34:31 +0200
committerChristoph Hellwig <hch@brick.lst.de>2009-04-29 15:34:31 +0200
commitb37482e651dc347bc8adfccb1a166f85d46744d0 (patch)
tree63db8d323d8ac1e8eea91de6ac6f289d4a5a3b75
parented2340bf3ea0e8eeeaef3d8f654abd9899b4f7cc (diff)
downloaddmapi-dev-b37482e651dc347bc8adfccb1a166f85d46744d0.tar.gz
keep autoconf-generated files over make distclean
We do want to ship the autoconf-generated files over make distclean and pick them up in Makepkgs so that a user compiling the program doesn't require autoconf. For that split up make distclean from make realclean and exclude the files we want to keep form the former. To make this easier to maintain adher to stricter rules of use for CONFIGURE and LDIRT. CONFIGURE now includes all generated files from autoconf (or for it like our copied install-sh) and gets only removed on make realclean, but added to LSRCFILES so that Makepkgs can pick it up. Everything else than needs to be removed on a realclean gets assigned to LDIRT. Also split up the configure rule into one to generate the configure script and one to run it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--Makefile25
1 files changed, 14 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 0547a2e..7e9a294 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,21 @@ ifeq ($(HAVE_BUILDDEFS), yes)
include $(TOPDIR)/include/builddefs
endif
-CONFIGURE = aclocal.m4 configure config.guess config.sub \
+CONFIGURE = aclocal.m4 configure config.guess config.sub configure install-sh \
ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
- m4/ltversion.m4 m4/lt~obsolete.m4 \
- include/builddefs
-LSRCFILES = configure.in Makepkgs install-sh README VERSION $(CONFIGURE)
+ m4/ltversion.m4 m4/lt~obsolete.m4
+LSRCFILES = configure.in Makepkgs README VERSION $(CONFIGURE)
LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
- Logs/* built .census install.* install-dev.* *.gz
+ Logs/* built .census install.* install-dev.* *.gz autom4te.cache/* \
+ libtool include/builddefs
LIB_SUBDIRS = include libdm
TOOL_SUBDIRS = m4 man doc debian build
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
-default: configure include/builddefs
+default: include/builddefs
ifeq ($(HAVE_BUILDDEFS), no)
$(MAKE) -C . $@
else
@@ -44,11 +44,13 @@ endif
# versions will copy those files anyway, and don't understand -i.
LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i`
-configure include/builddefs:
+configure:
libtoolize -c $(LIBTOOLIZE_INSTALL) -f
cp include/install-sh .
aclocal -I m4
autoconf
+
+include/builddefs: configure
./configure \
--prefix=/ \
--exec-prefix=/ \
@@ -77,7 +79,8 @@ install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
%-install-dev:
$(MAKE) -C $* install-dev
-realclean distclean: clean
- rm -f $(LDIRT) $(CONFIGURE)
- rm -f include/builddefs include/config.h install-sh libtool
- rm -rf autom4te.cache Logs
+distclean: clean
+ rm -f $(LDIRT)
+
+realclean: distclean
+ rm -f $(CONFIGURE)