From fb458a87b9e9bcbd017de639b1c645fffb3d92bf Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 10 May 2012 08:16:14 -0700 Subject: [PATCH] Revert "Make sure glib subdir is configure before dist" This reverts commit 1860fc8036800683c04958f81c88558d08b6847e. distclean breaks if glib is in DIST_SUBDIRS but we haven't actually generated the glib Makefiles by running glib's configure. --- Makefile.am | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8eb1d52..082b03d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,13 +48,3 @@ 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