From 64647b10a945c5aa6c8be7ba91c661d0ce8a9bed Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 10 May 2012 08:23:08 -0700 Subject: Conditionally add glib to DIST_SUBDIRS to fix distclean The glib configure script takes a long time to run, so we want to avoid it in the default case where we're using the system's glib. Unfortunately, that means we can't add it unconditionally to DIST_SUBDIRS since distclean will not always find Makefiles when it descends into glib. Make glib only be part of DIST_SUBDIRS when we've configured it. This will require a different hack to make sure dist always includes glib. --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 082b03d..3509721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,10 @@ endif SUBDIRS = $(GLIB_SUBDIR) $(POPT_SUBDIR) . check +# normally we'd want glib to be part of DIST_SUBDIRS unconditionally, +# but distclean gets broken unless we always run glib's configure +DIST_SUBDIRS = $(GLIB_SUBDIR) popt . check + m4dir = $(datadir)/aclocal m4_DATA = pkg.m4 -- cgit v1.2.1