Module: wine Branch: master Commit: b06ff1e55f6e0b2a2d0bcf08e8f67b4e3f93d5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06ff1e55f6e0b2a2d0bcf08e8...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Nov 10 18:28:28 2015 +0900
makefiles: Always build .in files.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 9 +++------ configure.ac | 5 +---- tools/Makefile.in | 2 -- tools/makedep.c | 3 +-- 4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/configure b/configure index 376b3f2..e1f69e0 100755 --- a/configure +++ b/configure @@ -705,11 +705,11 @@ COREFOUNDATION_LIBS LIBWINE_RULES SOCKET_LIBS DLLTOOL -LOADER_RULES ALL_TEST_RESOURCES READELF OTOOL LDD +LOADER_RULES LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7139,6 +7139,8 @@ LDRPATH_INSTALL=""
LDRPATH_LOCAL=""
+LOADER_RULES="" + LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -7863,11 +7865,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '([0-9]*)..*'`
-LOADER_RULES=" -all: wine.inf -" - - case $host_os in cygwin*|mingw32*) if test -n "$ac_tool_prefix"; then diff --git a/configure.ac b/configure.ac index a516b19..b9f90c7 100644 --- a/configure.ac +++ b/configure.ac @@ -677,6 +677,7 @@ AC_SUBST(dlldir,"${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") +AC_SUBST(LOADER_RULES,"") LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -689,10 +690,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '([[0-9]]*)..*'`
-AC_SUBST(LOADER_RULES,[" -all: wine.inf -"]) - case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) diff --git a/tools/Makefile.in b/tools/Makefile.in index bc13cc9..adf53bb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -6,5 +6,3 @@ C_SRCS = \
IN_SRCS = \ wineapploader.in - -all: wineapploader diff --git a/tools/makedep.c b/tools/makedep.c index e4ba7c4..d8cf2f5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2155,9 +2155,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar strmake( "y%s/%s.%s", dir, symlinks.str[i], section )); free( dest ); free( dir ); - strarray_add( &all_targets, xstrdup(obj) ); } - else strarray_add( &clean_files, xstrdup(obj) ); + strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj_dir_path( make, obj ));