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

make_makefiles: Check for idl sources in parent directory to set clean flag.

This commit is contained in:
Alexandre Julliard 2014-08-27 10:53:25 +02:00
parent 16000c6129
commit a2db8bc137
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -17421,7 +17421,7 @@ wine_fn_config_program cmd enable_cmd install,po
wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_test programs/cmd/tests cmd.exe_test
wine_fn_config_program conhost enable_conhost install wine_fn_config_program conhost enable_conhost install
wine_fn_config_program control enable_control install wine_fn_config_program control enable_control install
wine_fn_config_program cscript enable_cscript install wine_fn_config_program cscript enable_cscript clean,install
wine_fn_config_program dpnsvr enable_dpnsvr install wine_fn_config_program dpnsvr enable_dpnsvr install
wine_fn_config_program dxdiag enable_dxdiag install,po wine_fn_config_program dxdiag enable_dxdiag install,po
wine_fn_config_program eject enable_eject install wine_fn_config_program eject enable_eject install

2
configure.ac
View File

@ -3332,7 +3332,7 @@ WINE_CONFIG_PROGRAM(cmd,,[install,po])
WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_TEST(programs/cmd/tests)
WINE_CONFIG_PROGRAM(conhost,,[install]) WINE_CONFIG_PROGRAM(conhost,,[install])
WINE_CONFIG_PROGRAM(control,,[install]) WINE_CONFIG_PROGRAM(control,,[install])
WINE_CONFIG_PROGRAM(cscript,,[install]) WINE_CONFIG_PROGRAM(cscript,,[clean,install])
WINE_CONFIG_PROGRAM(dpnsvr,,[install]) WINE_CONFIG_PROGRAM(dpnsvr,,[install])
WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po])
WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(eject,,[install])

3
tools/make_makefiles
View File

@ -444,13 +444,14 @@ sub assign_sources_to_makefiles(@)
# preserve shared source files from the parent makefile # preserve shared source files from the parent makefile
foreach my $file (@makefiles) foreach my $file (@makefiles)
{ {
my %make = %{$makefiles{$file}}; my $make = $makefiles{$file};
my $parent = get_parent_makefile( $file ); my $parent = get_parent_makefile( $file );
next unless $parent; next unless $parent;
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" );
${${$make}{"=flags"}}{"clean"} = 1 if defined ${$make}{"=IDL_SRCS"} && @{${$make}{"=IDL_SRCS"}};
} }
} }