Alexandre Julliard : configure: Output maintainer-mode rules directly from configure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5eee920441408adf9fdc961ac747bc419186e017
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5eee920441408adf9fdc961ac7...

Author: Alexandre Julliard 
Date:   Sat Jan  1 12:04:45 2011 +0100

configure: Output maintainer-mode rules directly from configure.

---

Makefile.in  |    8 --------
 configure    |   11 +++++++++++
 configure.ac |   11 +++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index eec29bc..b1e790e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,14 +33,6 @@ WINAPI_CHECK_EXTRA_FLAGS = --global

# Rules for re-running configure

-$(srcdir)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4
-	cd $(srcdir) && autoconf --warnings=all
-
-$(srcdir)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in
-$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
-	cd $(srcdir) && autoheader --warnings=all
-	@echo timestamp > $@
-
 config.status: configure
    @./config.status --recheck

diff --git a/configure b/configure
index 6da7a5d..c9dac48 100755
--- a/configure
+++ b/configure
@@ -15391,6 +15391,17 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in"

+if test "x$enable_maintainer_mode" = xyes
+then
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$(srcdir)/configure: configure.ac aclocal.m4
+	cd $(srcdir) && autoconf --warnings=all
+
+$(srcdir)/include/config.h.in: include/stamp-h.in
+$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
+	cd $(srcdir) && autoheader --warnings=all
+	@echo timestamp > $@"
+fi
+
 if test -n "$with_wine64"
 then
 wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
diff --git a/configure.ac b/configure.ac
index eb166ee..3f06551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2939,6 +2939,17 @@ AC_CONFIG_FILES([Make.tmp:Make.vars.in:Makefile.in])

dnl Some final makefile rules

+if test "x$enable_maintainer_mode" = xyes
+then
+    WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
+[$(srcdir)/configure: configure.ac aclocal.m4
+	cd $(srcdir) && autoconf --warnings=all
+$(srcdir)/include/config.h.in: include/stamp-h.in
+$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
+	cd $(srcdir) && autoheader --warnings=all
+	@echo timestamp > $[@]])
+fi
+
 if test -n "$with_wine64"
 then
 WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],