ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Always build .in files. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2015-11-10 18:28:28 +09:00
parent fabc25d8b7
commit b06ff1e55f
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -705,11 +705,11 @@ COREFOUNDATION_LIBS
LIBWINE_RULES LIBWINE_RULES
SOCKET_LIBS SOCKET_LIBS
DLLTOOL DLLTOOL
LOADER_RULES
ALL_TEST_RESOURCES ALL_TEST_RESOURCES
READELF READELF
OTOOL OTOOL
LDD LDD
LOADER_RULES
LDRPATH_LOCAL LDRPATH_LOCAL
LDRPATH_INSTALL LDRPATH_INSTALL
DLLFLAGS DLLFLAGS
@ -7139,6 +7139,8 @@ LDRPATH_INSTALL=""
LDRPATH_LOCAL="" LDRPATH_LOCAL=""
LOADER_RULES=""
LIBEXT="so" LIBEXT="so"
DLLEXT=".so" DLLEXT=".so"
IMPLIBEXT="def" IMPLIBEXT="def"
@ -7863,11 +7865,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary" loader_programs="$wine_binary"
libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'` libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
LOADER_RULES="
all: wine.inf
"
case $host_os in case $host_os in
cygwin*|mingw32*) cygwin*|mingw32*)
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then

5
configure.ac
View File

@ -677,6 +677,7 @@ AC_SUBST(dlldir,"\${libdir}/wine")
AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(DLLFLAGS,"-D_REENTRANT")
AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_INSTALL,"")
AC_SUBST(LDRPATH_LOCAL,"") AC_SUBST(LDRPATH_LOCAL,"")
AC_SUBST(LOADER_RULES,"")
LIBEXT="so" LIBEXT="so"
DLLEXT=".so" DLLEXT=".so"
IMPLIBEXT="def" IMPLIBEXT="def"
@ -689,10 +690,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64"
loader_programs="$wine_binary" loader_programs="$wine_binary"
libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'` libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
AC_SUBST(LOADER_RULES,["
all: wine.inf
"])
case $host_os in case $host_os in
cygwin*|mingw32*) cygwin*|mingw32*)
AC_CHECK_TOOL(DLLTOOL,dlltool,false) AC_CHECK_TOOL(DLLTOOL,dlltool,false)

2
tools/Makefile.in
View File

@ -6,5 +6,3 @@ C_SRCS = \
IN_SRCS = \ IN_SRCS = \
wineapploader.in wineapploader.in
all: wineapploader

3
tools/makedep.c
View File

@ -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 )); strmake( "y%s/%s.%s", dir, symlinks.str[i], section ));
free( dest ); free( dest );
free( dir ); 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( "%s: %s\n", obj_dir_path( make, obj ), source->filename );
output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename );
output( "%s:", obj_dir_path( make, obj )); output( "%s:", obj_dir_path( make, obj ));