From a2db8bc137fbfa0bcf8664083e9969bf5a3f6745 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 27 Aug 2014 10:53:25 +0200 Subject: [PATCH] make_makefiles: Check for idl sources in parent directory to set clean flag. --- configure | 2 +- configure.ac | 2 +- tools/make_makefiles | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7bc8f1a63ff..a5c5eb44873 100755 --- a/configure +++ b/configure @@ -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_program conhost enable_conhost 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 dxdiag enable_dxdiag install,po wine_fn_config_program eject enable_eject install diff --git a/configure.ac b/configure.ac index 7de7a87a31f..b93cf6a4c59 100644 --- a/configure.ac +++ b/configure.ac @@ -3332,7 +3332,7 @@ WINE_CONFIG_PROGRAM(cmd,,[install,po]) WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(conhost,,[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(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(eject,,[install]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 861023a6b02..649b434f370 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -444,13 +444,14 @@ sub assign_sources_to_makefiles(@) # preserve shared source files from the parent makefile foreach my $file (@makefiles) { - my %make = %{$makefiles{$file}}; + my $make = $makefiles{$file}; my $parent = get_parent_makefile( $file ); next unless $parent; 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}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); + ${${$make}{"=flags"}}{"clean"} = 1 if defined ${$make}{"=IDL_SRCS"} && @{${$make}{"=IDL_SRCS"}}; } }