summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-11-21 00:02:18 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-11-21 00:05:56 +0100
commit38a22f56caa1925954b3f505a6b4326b41625a05 (patch)
tree84b1219f12632e99ddcd88853fde619b3268ecbd /Makefile.in
parentd2bbcb539d3c67b305f274b204fa5dcc4f5d9020 (diff)
just use wildcard here
Change-Id: I2c145328b03f66a6a67c0afa0463005112fd77da
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in19
1 files changed, 5 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in
index a7518b81e7c0..9b6d0a93c09a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,26 +32,17 @@ Makefile: $(BUILDDIR)/config_host.mk force-restart
@touch $@
# run configure in an environment not polluted by config_host.mk
-$(BUILDDIR)/config_host.mk : \
+$(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/config_host.mk.in \
$(SRCDIR)/Makefile.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
- $(wildcard $(SRCDIR)/config_host/*.h.in) \
- $(if $(wildcard $(BUILDDIR)/autogen.input),$(BUILDDIR)/autogen.input,$(if $(wildcard $(BUILDDIR)/autogen.lastrun),$(BUILDDIR)/autogen.lastrun))
+ $(SRCDIR)/config_host/*.h.in \
+ $(BUILDDIR)/autogen.input \
+ $(BUILDDIR)/autogen.lastrun \
+ )
$(SRCDIR)/autogen.sh
-# dummy rule in case any of the above prerequisites are removed, so
-# that a stale Makefile still triggers autogen.sh, or in case
-# autogen.input does not exist, or autogen.lastrun does not yet exist
-$(SRCDIR)/config_host.mk.in \
-$(SRCDIR)/Makefile.in \
-$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
-$(SRCDIR)/configure.ac \
-$(BUILDDIR)/autogen.input \
-$(BUILDDIR)/autogen.lastrun:
- @true
-
else # MAKE_RESTARTS
all: build