diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:23:08 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:23:08 -0700 |
| commit | 64647b10a945c5aa6c8be7ba91c661d0ce8a9bed (patch) | |
| tree | c12d688a5abcd8ab2e021f746b3bef6958ce845e | |
| parent | fb458a87b9e9bcbd017de639b1c645fffb3d92bf (diff) | |
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.
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
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 |