From 2e77c2aaa898b5b83076ef178ae4099dd9593cb0 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Thu, 3 May 2007 17:53:14 +0000 Subject: [PATCH] Don't use the $(wildcard ...) GNU extension --- Makefile.am | 2 +- configure.ac | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6037d95..b59f756 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ demo-tarball: $(DEMO).tar.gz $(DEMO).tar.gz: $(DEMO) $(TAR_PROGRAM) cf - $(DEMO) | $(GZIP_PROGRAM) -9 > $@ -demo: $(wildcard $(srcdir)/demo/src/Common/*.[ch]) $(top_builddir)/config.status +demo: @DEMOSOURCES@ $(top_builddir)/config.status echo $? @case '$?' in \ *config.status*) \ diff --git a/configure.ac b/configure.ac index b84b5d4..ee81113 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,10 @@ AC_CONFIG_COMMANDS([demo], find demo -exec chmod u+rwX \{\} \; fi]) +# Collect the demo programs +DEMOSOURCES=`find ${srcdir}/demo/src -name "*.\[ch\]"` +AC_SUBST(DEMOSOURCES) + # # A special command that checks whether alberta_util_inlines.h exists # and is identical to alberta_util_inlines.h.in. Then do nothing. If @@ -66,7 +70,7 @@ fi]) # ALBERT_DIMENSION_ENABLE/DISABLE() macros # -AM_INIT_AUTOMAKE([1.7 dist-bzip2]) +AM_INIT_AUTOMAKE([1.10 dist-bzip2]) AM_CONFIG_HEADER([config.h]) # change the installation directory. This could surely be done more elegantly... @@ -544,7 +548,6 @@ if test "z${EXPERIMENTAL}" = "z1"; then AC_MSG_RESULT([]) fi - # # flush everything to disk # -- GitLab