[Libreoffice-commits] core.git: Makefile.in

[Matúš Kukan]

 Makefile.in |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 38a22f56caa1925954b3f505a6b4326b41625a05
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Nov 21 00:02:18 2013 +0100

    just use wildcard here
    
    Change-Id: I2c145328b03f66a6a67c0afa0463005112fd77da

diff --git a/Makefile.in b/Makefile.in
index a7518b8..9b6d0a9 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