fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-02-04 23:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conditionally add glib to DIST_SUBDIRS to fix distclean

Browse source 
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.
This commit is contained in:
Dan Nicholson 2012-05-10 08:23:08 -07:00
parent fb458a87b9
commit 64647b10a9
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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