Alexandre Julliard : makefiles: Only define the dummy target in makefiles that need it.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 22 10:22:08 CDT 2015
Module: wine
Branch: master
Commit: 90d66cc874addb09b5acc321c64dd8c562807243
URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d66cc874addb09b5acc321c64dd8c562807243
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Oct 22 21:36:15 2015 +0900
makefiles: Only define the dummy target in makefiles that need it.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
Make.vars.in | 3 +--
Makefile.in | 3 ++-
libs/wine/Makefile.in | 4 +++-
programs/winetest/Makefile.in | 3 +++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Make.vars.in b/Make.vars.in
index e825f4b..e2de171 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -72,7 +72,6 @@ conf_manext = 5
@SET_MAKE@
all:
-dummy:
-.PHONY: all dummy
+.PHONY: all
# End of common header
diff --git a/Makefile.in b/Makefile.in
index b600cf7..9c5158d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,8 +50,9 @@ uninstall:: __uninstall__
# dependencies needed to build any dll or program
__tooldeps__: libs/port libs/wine libs/wpp
__builddeps__: __tooldeps__ include
-.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__
+.PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__
+dummy:
loader: libs/port libs/wine tools
server: libs/port libs/wine tools include
fonts: tools/sfnt2fon
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index c961ba5..bc5f6fe 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -107,8 +107,10 @@ config_EXTRADEFS = \
version.c: dummy
version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine- at PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+dummy:
+
# Make sure that make_makefiles sees the generated rules
-.PHONY: install install-lib install-dev uninstall
+.PHONY: dummy install install-lib install-dev uninstall
install install-lib::
install install-dev::
clean::
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 1c25e25..7bdfe2a 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -26,3 +26,6 @@ build.nfo:
build.res: build.rc build.nfo
$(WRC) -o $@ build.rc
+
+dummy:
+.PHONY: dummy
More information about the wine-cvs
mailing list