Alexandre Julliard : makedep: Generate a list of phony targets.
Alexandre Julliard
julliard at winehq.org
Mon Dec 30 13:05:59 CST 2013
Module: wine
Branch: master
Commit: 3b7cc5ec92ea6bbbee2bb8ea91e131e93f014812
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7cc5ec92ea6bbbee2bb8ea91e131e93f014812
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Dec 28 11:41:45 2013 +0100
makedep: Generate a list of phony targets.
---
Make.rules.in | 2 --
configure | 3 +--
configure.ac | 3 +--
tools/makedep.c | 13 +++++++++++++
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 7e50787..08b790d 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -85,8 +85,6 @@ $(WINETEST_RES): $(TESTMODULE_STRIPPED)
all: $(MANPAGES:.man.in=.man)
-.PHONY: install-man-pages
-
# Rules for cleaning
clean::
diff --git a/configure b/configure
index f56f46a..10dea9a 100755
--- a/configure
+++ b/configure
@@ -16602,8 +16602,6 @@ EXTRA_OBJS = testlist.o
all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES)
\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT)
-
-.PHONY: check test testclean crosstest
"
if test -n "$CROSSTARGET"
@@ -16613,6 +16611,7 @@ MAKEDEPFLAGS = -xo -xcross.o
CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe
crosstest: \$(CROSSTESTMODULE)
+.PHONY: crosstest
"
fi
diff --git a/configure.ac b/configure.ac
index b4fc0b1..afec9bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2658,8 +2658,6 @@ EXTRA_OBJS = testlist.o
all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES)
\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT)
-
-.PHONY: check test testclean crosstest
")
if test -n "$CROSSTARGET"
then
@@ -2668,6 +2666,7 @@ MAKEDEPFLAGS = -xo -xcross.o
CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe
crosstest: \$(CROSSTESTMODULE)
+.PHONY: crosstest
")
fi
diff --git a/tools/makedep.c b/tools/makedep.c
index 041ef2e..4eab2a8 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1350,6 +1350,7 @@ static struct strarray output_sources(void)
struct strarray dlldata_files = empty_strarray;
struct strarray includes = empty_strarray;
struct strarray subdirs = empty_strarray;
+ struct strarray phony_targets = empty_strarray;
strarray_add( &includes, "-I." );
if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir ));
@@ -1492,6 +1493,7 @@ static struct strarray output_sources(void)
dir, dest, source->sourcename );
free( dest );
free( dir );
+ strarray_add_uniq( &phony_targets, "install-man-pages" );
}
strarray_add( &clean_files, xstrdup(obj) );
output( "%s: %s\n", obj, sourcedep );
@@ -1631,6 +1633,9 @@ static struct strarray output_sources(void)
output_filenames( &ok_files, &column );
output( "\n" );
strarray_addall( &clean_files, &ok_files );
+ strarray_add( &phony_targets, "check" );
+ strarray_add( &phony_targets, "test" );
+ strarray_add( &phony_targets, "testclean" );
}
if (clean_files.count)
@@ -1648,6 +1653,14 @@ static struct strarray output_sources(void)
output( ":\n" );
output( "\t$(MKDIR_P) -m 755 $@\n" );
}
+
+ if (phony_targets.count)
+ {
+ column = output( ".PHONY:" );
+ output_filenames( &phony_targets, &column );
+ output( "\n" );
+ }
+
return clean_files;
}
More information about the wine-cvs
mailing list