diff --git a/CHANGES b/CHANGES index 416b75f4..9c478aee 100644 --- a/CHANGES +++ b/CHANGES @@ -102,3 +102,7 @@ o yupdate: fix in comment handling 1.1.7-0 ------- o big changes everywhere, triggered by different uclnt thread scheme + +1.1.7-1 +------- +o preserving targets over config target invocation diff --git a/Makefile b/Makefile index 03cea911..9aa6f8ad 100644 --- a/Makefile +++ b/Makefile @@ -31,5 +31,3 @@ include $(MODDIR)/make/rpmdist.mk endif include $(MODDIR)/make/autoconf.mk - - diff --git a/VERSION b/VERSION index 23a44ef5..3d39b781 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.5-3-dev +1.1.7-1-dev diff --git a/make/autoconf.mk b/make/autoconf.mk index 59122340..3fa56fa2 100644 --- a/make/autoconf.mk +++ b/make/autoconf.mk @@ -3,16 +3,21 @@ # contact@jannet.de # $Id$ +CONFIG_ACDONE := $(wildcard config.acdone) CLEAN += $(wildcard *.acdone) DISTCLEAN += configure config.log autoscan.log configure.ac config.status AC_FILES_IN = $(shell find . -name '*.in' | grep -ve "contrib\|dist") AC_FILES = $(basename $(AC_FILES_IN)) all: config $(AC_FILES) + if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi config: config.acdone $(AC_FILES) install: config $(AC_FILES) + if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi +distclean: confclean confclean: - rm -f $(DISTCLEAN) $(CLEAN) $(AC_FILES) + rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache + configure.ac: configure.ac.tmpl VERSION cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@