X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=Makefile.devel;h=74e326d79576d6486868a1b991d2d0fb0bca9352;hb=d7dbc185bcdf3118eebc882ad3de815cb90aacdd;hp=6081c7ba3083b101fcb72b6d96d04f9d1d45875d;hpb=f3557ad402196c74082003518d1ce79bf0f4a768;p=cln.git

diff --git a/Makefile.devel b/Makefile.devel
index 6081c7b..74e326d 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -12,30 +12,28 @@ PACK = tar
 PACKOPT = cvfhj
 PACKEXT = .tar.bz2
 
-EXCLUDE=--exclude CVS --exclude \*.o --exclude *.lo --exclude .cvsignore   \
+EXCLUDE=--exclude CVS\* --exclude \*.o --exclude *.lo --exclude .cvsignore \
         --exclude \*~ --exclude .\#\* --exclude .libs                      \
+        --exclude autogen.sh                                               \
         --exclude ${AUTOCONF_CACHE}
 
-all: configures documentation
+all: build-prerequisites documentation
 
 
+build-prerequisites: configures
+
 CONFIGURES = configure
 CONFIGURES_IN = configure.ac
 
 AUTOCONF_FILES = autoconf/aclocal.m4
+AUTOCONF_MACROS = ${wildcard m4/*.m4} # originally borrowed from GNU clisp
 AUTOCONF = autoconf
 AUTOCONF_CACHE = autom4te.cache
 
 configures: ${CONFIGURES}
 
-configure: configure.ac ${AUTOCONF_FILES}
-	${AUTOCONF} --include=autoconf
-
-# This is the upstream location for most of the .m4 files:
-CLISP_M4DIR = ~/contrib/clisp/src/m4
-
-autoconf/aclocal.m4: ${wildcard m4/*.m4}
-	aclocal -I m4 -I ${CLISP_M4DIR} --output=autoconf/aclocal.m4
+configure: configure.ac ${AUTOCONF_FILES} ${AUTOCONF_MACROS}
+	${AUTOCONF} --include=autoconf -I m4
 
 # Release:
 SRC_DIST=/tmp/cln-${VER}${PACKEXT}
@@ -44,11 +42,14 @@ VER=${shell echo `grep "CL_VERSION " include/cln/version.h |sed 's/^.*CL_VERSION
 src-distrib: include/cln/version.h force
 	${MAKE} -f Makefile.devel src--distrib TOPDIR=cln-${VER}
 
-src--distrib: force
+src--distrib: clean
 	ln -s . ${TOPDIR}
 	${PACK} ${PACKOPT} ${SRC_DIST} ${EXCLUDE} --exclude ${TOPDIR}/${TOPDIR} ${TOPDIR}
 	rm -f ${TOPDIR}
 
+clean: force
+	test -f Makefile && ${MAKE} distclean
+
 # Syntaxcheck:
 check-configures: ${CONFIGURES}
 	set -e; for f in ${CONFIGURES}; do bash -x -n $$f; done