Alexandre Julliard : makefiles: Add rules for automatically rebuilding makefiles.
Alexandre Julliard
julliard at winehq.org
Thu Jun 12 09:44:03 CDT 2008
Module: docs
Branch: master
Commit: 559e6a4df184891bfdc565e7f225ea0514444c26
URL: http://source.winehq.org/git/docs.git/?a=commit;h=559e6a4df184891bfdc565e7f225ea0514444c26
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 12 14:18:23 2008 +0200
makefiles: Add rules for automatically rebuilding makefiles.
---
Make.rules.in | 6 +-----
Makefile.in | 31 +++++++++++++++++++++++--------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 218ef74..fda8e81 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -17,7 +17,7 @@ DB2TXT = @DB2TXT@
PO4ADIR = $(TOPSRCDIR)/po4a
PO4AENV = PERLLIB=$(PO4ADIR)/lib
-all: Makefile $(SUBDIRS)
+all: $(SUBDIRS)
doc: html pdf ps txt
html: $(ALLBOOKS:%=%.html) $(SUBDIRS:%=%/__html__)
@@ -106,8 +106,4 @@ $(ALLFORMATS:%=wineusr-guide.%): $(WINEUSR_SRCS)
$(ALLFORMATS:%=winedev-guide.%): $(WINEDEV_SRCS)
$(ALLFORMATS:%=winelib-guide.%): $(WINELIB_SRCS)
-Makefile: Makefile.in $(TOPSRCDIR)/configure
- @echo $? is newer than '$@', please rerun $(TOPSRCDIR)/configure!
- @exit 1
-
### End of global rules
diff --git a/Makefile.in b/Makefile.in
index 480ed04..368d401 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,17 +6,32 @@ VPATH = @srcdir@
SUBDIRS = \
en
-all: Make.rules
-
@MAKE_RULES@
-distclean: clean
- $(RM) config.* configure.lineno TAGS tags Make.rules
+distclean:: clean
+ $(RM) config.* configure.lineno TAGS tags
$(RM) -r autom4te.cache
- $(RM) `find . \( -name Makefile -o -size 0 \) -print`
+
+config.status: configure
+ @./config.status --recheck
+
+# Makefiles rules
+
+ALL_MAKEFILES = Make.rules $(SUBDIRS:%=%/Makefile)
+
+Makefile $(ALL_MAKEFILES): config.status
+ @./config.status $@
+.INIT: Makefile
+.BEGIN: Makefile
+
+$(SUBDIRS): $(ALL_MAKEFILES)
+
+distclean::
+ $(RM) Makefile $(ALL_MAKEFILES)
# Manual dependencies
-Make.rules: Make.rules.in $(TOPSRCDIR)/configure
- @echo $? is newer than '$@', please rerun $(TOPSRCDIR)/configure!
- @exit 1
+Make.rules: Make.rules.in
+Makefile: Makefile.in Make.rules
+en/Makefile: en/Makefile.in Make.rules
+fr/Makefile: fr/Makefile.in Make.rules
More information about the wine-cvs
mailing list