Module: wine Branch: master Commit: cc0420ac3115d04c724d3d3ee4913d38146dcb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0420ac3115d04c724d3d3ee4...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 4 17:23:03 2015 +0900
makefiles: Get rid of the obsolete IMPLIB_SRCS variable.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dinput/Makefile.in | 2 -- tools/make_makefiles | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 2851f5b..5d287a3 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -16,8 +16,6 @@ C_SRCS = \ keyboard.c \ mouse.c
-IMPLIB_SRCS = data_formats.c - IDL_SRCS = dinput_classes.idl
RC_SRCS = dinput.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index 1525769..28e448a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -207,7 +207,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -345,11 +345,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } elsif ($name =~ /.c$/) { - if (defined $flags{"implib"}) - { - push @{${$make}{"=IMPLIB_SRCS"}}, $name; - ${${$make}{"=flags"}}{"staticimplib"} = 1; - } + ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"}; push @{${$make}{"=C_SRCS"}}, $name; } elsif ($name =~ /.h$/) @@ -500,7 +496,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); - replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); }