mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
$(TOPDIR), make: Preserving targets over config target invocation
This commit is contained in:
parent
18010ab1b3
commit
b96b1b7e37
4 changed files with 11 additions and 4 deletions
4
CHANGES
4
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
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -31,5 +31,3 @@ include $(MODDIR)/make/rpmdist.mk
|
|||
endif
|
||||
|
||||
include $(MODDIR)/make/autoconf.mk
|
||||
|
||||
|
||||
|
|
|
|||
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
1.1.5-3-dev
|
||||
1.1.7-1-dev
|
||||
|
|
|
|||
|
|
@ -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//'`/" > $@
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue