Alexandre Julliard : makefiles: Add a dummy dependency on empty targets to work around a FreeBSD make bug.

Alexandre Julliard julliard at winehq.org
Tue Mar 3 11:53:48 CST 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar  3 16:23:16 2009 +0100

makefiles: Add a dummy dependency on empty targets to work around a FreeBSD make bug.

---

 Make.rules.in              |   14 +++++++-------
 dlls/Makedll.rules.in      |    6 +++---
 programs/Makeprog.rules.in |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 3645603..5dc8884 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -271,10 +271,10 @@ $(SUBDIRS:%=%/__install-dev__): dummy
 $(SUBDIRS:%=%/__uninstall__): dummy
 	@cd `dirname $@` && $(MAKE) uninstall
 
-install:: $(INSTALLSUBDIRS:%=%/__install__)
-install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
-install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
-uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
+install:: $(INSTALLSUBDIRS:%=%/__install__) dummy
+install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) dummy
+install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) dummy
+uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy
 
 $(INSTALLDIRS):
 	$(MKINSTALLDIRS) $@
@@ -294,11 +294,11 @@ $(TESTSUBDIRS:%=%/__crosstest__): dummy
 $(TESTSUBDIRS:%=%/__testclean__): dummy
 	@cd `dirname $@` && $(MAKE) testclean
 
-check test:: $(TESTSUBDIRS:%=%/__test__)
+check test:: $(TESTSUBDIRS:%=%/__test__) dummy
 
-crosstest:: $(TESTSUBDIRS:%=%/__crosstest__)
+crosstest:: $(TESTSUBDIRS:%=%/__crosstest__) dummy
 
-testclean:: $(TESTSUBDIRS:%=%/__testclean__)
+testclean:: $(TESTSUBDIRS:%=%/__testclean__) dummy
 
 .PHONY: check test testclean crosstest $(TESTSUBDIRS:%=%/__test__) $(TESTSUBDIRS:%=%/__crosstest__) $(TESTSUBDIRS:%=%/__testclean__) 
 
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index ca9e972..76747b6 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -62,9 +62,9 @@ $(SUBDIRS): implib
 
 # Rules for testing
 
-check test:: $(SUBDIRS:%=%/__test__)
+check test:: $(SUBDIRS:%=%/__test__) dummy
 
-crosstest:: $(SUBDIRS:%=%/__crosstest__)
+crosstest:: $(SUBDIRS:%=%/__crosstest__) dummy
 
 # Rules for auto documentation
 
@@ -97,7 +97,7 @@ $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)
 install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy
 	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
 
-install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
+install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy
 
 uninstall::
 	-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB)
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 1f9fe78..add239f 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -31,7 +31,7 @@ $(MODULE): $(OBJS) $(RCOBJS) Makefile.in
 
 # Rules for testing
 
-check test:: $(SUBDIRS:%=%/__test__)
+check test:: $(SUBDIRS:%=%/__test__) dummy
 
 $(TESTRESULTS): $(MODULE)$(DLLEXT)
 




More information about the wine-cvs mailing list