From: Ivo Timmermans <ivo@lychnis.net>
Date: Tue, 25 Apr 2000 10:22:26 +0000 (+0000)
Subject: Generate this Makefile.am from Makefile.am.in.
X-Git-Tag: release-1.0pre1~64
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=94921d6e57e01b378ab8b1d8ea9cf3da9511fbef;p=tinc

Generate this Makefile.am from Makefile.am.in.
---

diff --git a/autogen.sh b/autogen.sh
index 6375e6f8..55a27a95 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -94,6 +94,9 @@ do
       aclocalinclude="$ACLOCAL_FLAGS"
       for k in $macrodirs; do
   	if test -d $k; then
+	  if test -f $k/Makefile.am.in; then
+	    make -C $k -f Makefile.am.in Makefile.am
+	  fi
           aclocalinclude="$aclocalinclude -I $k"
   	##else 
 	##  echo "**Warning**: No such directory \`$k'.  Ignored."
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index f60c83cf..00000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-## Process this file with automake to produce Makefile.in   -*-Makefile-*-
-
-##m4-files-begin
-EXTRA_DIST = README Makefile.am.in malloc.m4 perl.m4 realloc.m4
-
-##m4-files-end
-
-Makefile.am: Makefile.am.in
-	rm -f $@ $@t
-	sed -n '1,/^##m4-files-begin/p' $< > $@t
-	( echo EXTRA_DIST = README Makefile.am.in; \
-	  find . -type f -name '*.m4' -print |sed 's,^\./,,' |sort ) \
-	  |fmt | (tr '\012' @; echo) \
-	      |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
-	        >> $@t
-	sed -n '/^##m4-files-end/,$$p' $< >> $@t
-	chmod a-w $@t
-	mv $@t $@