Alexandre Julliard : makefiles: Make sure that all phony targets depend on 'dummy'.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dc8c76ae3c2006e4a692c2df237fb4a41cd138af
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8c76ae3c2006e4a692c2df...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Sep  9 23:09:04 2006 +0200

makefiles: Make sure that all phony targets depend on 'dummy'.

---

 Make.rules.in             |    4 ++--
 Makefile.in               |    2 +-
 dlls/Makedll.rules.in     |   20 +++++++++-----------
 documentation/Makefile.in |   13 +++++--------
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 1d3f4c3..eecbffd 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -181,7 +181,7 @@ # 'all' target first in case the enclosi
 
 all: Makefile
 
-filter:
+filter: dummy
 	@$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all
 
 .PHONY: all filter
@@ -226,7 +226,7 @@ DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC
 $(SUBDIRS:%=%/__depend__): dummy
 	@cd `dirname $@` && $(MAKE) depend
 
-depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__)
+depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) dummy
 	$(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
 
 .PHONY: depend $(SUBDIRS:%=%/__depend__)
diff --git a/Makefile.in b/Makefile.in
index 700cbad..0f9881e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,7 +118,7 @@ TAGS etags:
 tags ctags:
 	find $(TOPSRCDIR)/ -name '*.[ch]' -print | ctags --c-types=+px -L -
 
-manpages htmlpages sgmlpages:
+manpages htmlpages sgmlpages: dummy
 	@cd documentation && $(MAKE) $@
 
 clean::
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 428d717..632730f 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -69,13 +69,13 @@ crosstest:: $(SUBDIRS:%=%/__crosstest__)
 
 # Rules for auto documentation
 
-man: $(C_SRCS)
+man: $(C_SRCS) dummy
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -C$(SRCDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
-doc-html: $(C_SRCS)
+doc-html: $(C_SRCS) dummy
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
-doc-sgml: $(C_SRCS)
+doc-sgml: $(C_SRCS) dummy
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
 .PHONY: man doc-html doc-sgml
@@ -88,28 +88,26 @@ ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll16
 
 WIN16_INSTALL = $(SPEC_SRCS16:%=_install_/%)
 
-.PHONY: install_lib install_static_implib_def install_static_implib_a
+.PHONY: install_static_implib_def install_static_implib_a
 .PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
 
 $(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%)
 
-$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir)
+$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) dummy
 	echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@`
 
-install_lib: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)
-	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
-
-$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir)
+$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy
 	$(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
 
-install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir)
+install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) dummy
 	$(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB)
 
 install_static_implib_a:
 
 $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)
 
-install install-lib:: install_lib @WIN16_INSTALL@
+install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) @WIN16_INSTALL@ dummy
+	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
 
 install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
 
diff --git a/documentation/Makefile.in b/documentation/Makefile.in
index bf23bd4..18cf1de 100644
--- a/documentation/Makefile.in
+++ b/documentation/Makefile.in
@@ -4,25 +4,22 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 
-INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext)
+INSTALLDIRS = man$(api_manext) html api-guide $(DESTDIR)$(mandir)/man$(api_manext)
 
 @MAKE_RULES@
 
-manpages:
-	$(MKINSTALLDIRS) man$(api_manext)
+manpages: man$(api_manext) dummy
 	@cd $(DLLDIR) && $(MAKE) man
 
-htmlpages:
-	$(MKINSTALLDIRS) html
+htmlpages: html dummy
 	@cd $(DLLDIR) && $(MAKE) doc-html
 
-sgmlpages:
-	$(MKINSTALLDIRS) api-guide
+sgmlpages: api-guide dummy
 	@cd $(DLLDIR) && $(MAKE) doc-sgml
 
 .PHONY: manpages htmlpages sgmlpages
 
-install:: manpages $(INSTALLDIRS)
+install:: manpages $(DESTDIR)$(mandir)/man$(api_manext)
 	for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
 
 clean::