janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

Remove all: And install: target clashes with dirs.mk

Browse source
This commit is contained in:
Jan Lindemann 2005-05-16 15:44:19 +00:00 • committed by Jan Lindemann
commit dee4fee2f1
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/autoconf.mk
View file

@ -4,15 +4,17 @@
# $Id$ # $Id$
CONFIG_ACDONE := $(wildcard config.acdone) CONFIG_ACDONE := $(wildcard config.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' -maxdepth 2 | grep -ve "contrib\|dist\|nomake") AC_FILES_IN = $(shell find . -name '*.in' -maxdepth 2 | grep -ve "contrib\|dist\|nomake")
AC_FILES = $(basename $(AC_FILES_IN)) AC_FILES = $(basename $(AC_FILES_IN))
all: config $(AC_FILES) all: config.acdone make_all
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
make_all: config $(AC_FILES)
if [ -z "$(CONFIG_ACDONE)" ]; then make all; fi
config: config.acdone $(AC_FILES) config: config.acdone $(AC_FILES)
install: config $(AC_FILES) install: config $(AC_FILES) make_install
make_install:
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
distclean: confclean distclean: confclean
confclean: confclean:
@ -39,3 +41,6 @@ $(TOPDIR)/make/%.mk: $(TOPDIR)/make/%.mk.in config.status
$(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status $(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status
./config.status $@ ./config.status $@
touch $@ touch $@
acclean:
rm -f *.acdone