diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-04-12 05:37:22 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-04-21 12:48:24 -0700 |
| commit | 1860fc8036800683c04958f81c88558d08b6847e (patch) | |
| tree | dd4cd6c2654d7c2b043038af1b12cf2410bdf7f3 | |
| parent | c74da521af566bc208ff9a2da3e43634817f73d5 (diff) | |
Make sure glib subdir is configure before dist
We want to distribute the glib subdir, but we want to avoid configuring
it for the default build case where the system glib is used. Override
the standard dist target so that we can reconfigure with
--with-internal-glib if necessary. I think the target should be
compatible with the original dist.
This is pretty hacky and may need to be reverted if it breaks dist.
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 082b03d..8eb1d52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,3 +48,13 @@ pkg_config_SOURCES= \ parse.c \ main.c DISTCHECK_CONFIGURE_FLAGS = --with-installed-popt --with-internal-glib + +# Override the normal dist so that we can make sure the glib subdir is +# configured first. Otherwise it will just bomb entering the directory. +dist dist-all: check-glib-Makefile + @$(MAKE) $(AM_MAKEFLAGS) dist-gzip +check-glib-Makefile: + @if test ! -f glib/Makefile; then \ + echo $(SHELL) $(top_srcdir)/configure --with-internal-glib; \ + $(SHELL) $(top_srcdir)/configure --with-internal-glib; \ + fi |