janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 15:52:49 +01:00
Code Activity

$(TOPDIR), make: Preserving targets over config target invocation

Browse source
This commit is contained in:
Jan Lindemann 2003-12-21 11:11:13 +00:00 • committed by Jan Lindemann
commit b96b1b7e37
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -102,3 +102,7 @@ o yupdate: fix in comment handling
1.1.7-0 1.1.7-0
------- -------
o big changes everywhere, triggered by different uclnt thread scheme o big changes everywhere, triggered by different uclnt thread scheme
1.1.7-1
-------
o preserving targets over config target invocation

2
Makefile
View file

@ -31,5 +31,3 @@ include $(MODDIR)/make/rpmdist.mk
endif endif
include $(MODDIR)/make/autoconf.mk include $(MODDIR)/make/autoconf.mk

2
VERSION
View file

@ -1 +1 @@
1.1.5-3-dev 1.1.7-1-dev

7
make/autoconf.mk
View file

@ -3,16 +3,21 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
CONFIG_ACDONE := $(wildcard config.acdone)
CLEAN += $(wildcard *.acdone) CLEAN += $(wildcard *.acdone)
DISTCLEAN += configure config.log autoscan.log configure.ac config.status DISTCLEAN += configure config.log autoscan.log configure.ac config.status
AC_FILES_IN = $(shell find . -name '*.in' | grep -ve "contrib\|dist") AC_FILES_IN = $(shell find . -name '*.in' | grep -ve "contrib\|dist")
AC_FILES = $(basename $(AC_FILES_IN)) AC_FILES = $(basename $(AC_FILES_IN))
all: config $(AC_FILES) all: config $(AC_FILES)
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
config: config.acdone $(AC_FILES) config: config.acdone $(AC_FILES)
install: config $(AC_FILES) install: config $(AC_FILES)
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
distclean: confclean
confclean: confclean:
rm -f $(DISTCLEAN) $(CLEAN) $(AC_FILES) rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache
configure.ac: configure.ac.tmpl VERSION configure.ac: configure.ac.tmpl VERSION
cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@ cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@