Commit ffeb530c authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Always use the global SOURCES variable for .y files.

parent 94771cf0
MODULE = jscript.dll MODULE = jscript.dll
IMPORTS = oleaut32 ole32 user32 advapi32 IMPORTS = oleaut32 ole32 user32 advapi32
C_SRCS = \ SOURCES = \
activex.c \ activex.c \
array.c \ array.c \
bool.c \ bool.c \
cc_parser.y \
compile.c \ compile.c \
date.c \ date.c \
decode.c \ decode.c \
...@@ -15,7 +16,10 @@ C_SRCS = \ ...@@ -15,7 +16,10 @@ C_SRCS = \
function.c \ function.c \
global.c \ global.c \
jscript.c \ jscript.c \
jscript.rc \
jscript_classes.idl \
jscript_main.c \ jscript_main.c \
jsglobal.idl \
json.c \ json.c \
jsregexp.c \ jsregexp.c \
jsstr.c \ jsstr.c \
...@@ -24,17 +28,8 @@ C_SRCS = \ ...@@ -24,17 +28,8 @@ C_SRCS = \
math.c \ math.c \
number.c \ number.c \
object.c \ object.c \
parser.y \
regexp.c \ regexp.c \
set.c \ set.c \
string.c \ string.c \
vbarray.c vbarray.c
RC_SRCS = jscript.rc
IDL_SRCS = \
jscript_classes.idl \
jsglobal.idl
BISON_SRCS = \
cc_parser.y \
parser.y
...@@ -4,13 +4,14 @@ IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 ...@@ -4,13 +4,14 @@ IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32
EXTRAIDLFLAGS = --prefix-server=s_ EXTRAIDLFLAGS = --prefix-server=s_
C_SRCS = \ SOURCES = \
action.c \ action.c \
alter.c \ alter.c \
appsearch.c \ appsearch.c \
assembly.c \ assembly.c \
automation.c \ automation.c \
classes.c \ classes.c \
cond.y \
create.c \ create.c \
custom.c \ custom.c \
database.c \ database.c \
...@@ -26,8 +27,10 @@ C_SRCS = \ ...@@ -26,8 +27,10 @@ C_SRCS = \
install.c \ install.c \
media.c \ media.c \
msi.c \ msi.c \
msi.rc \
msi_main.c \ msi_main.c \
msiquery.c \ msiquery.c \
msiserver.idl \
package.c \ package.c \
patch.c \ patch.c \
record.c \ record.c \
...@@ -35,6 +38,7 @@ C_SRCS = \ ...@@ -35,6 +38,7 @@ C_SRCS = \
script.c \ script.c \
select.c \ select.c \
source.c \ source.c \
sql.y \
storages.c \ storages.c \
streams.c \ streams.c \
string.c \ string.c \
...@@ -43,14 +47,5 @@ C_SRCS = \ ...@@ -43,14 +47,5 @@ C_SRCS = \
tokenize.c \ tokenize.c \
update.c \ update.c \
upgrade.c \ upgrade.c \
where.c where.c \
IDL_SRCS = \
msiserver.idl \
winemsi.idl winemsi.idl
BISON_SRCS = \
cond.y \
sql.y
RC_SRCS = msi.rc
...@@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32 ...@@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
compile.c \ compile.c \
global.c \ global.c \
interp.c \ interp.c \
lex.c \ lex.c \
parser.y \
regexp.c \ regexp.c \
utils.c \ utils.c \
vbdisp.c \ vbdisp.c \
vbregexp.c \ vbregexp.c \
vbscript.c \ vbscript.c \
vbscript_main.c vbscript.rc \
BISON_SRCS = \
parser.y
RC_SRCS = vbscript.rc
IDL_SRCS = \
vbscript_classes.idl \ vbscript_classes.idl \
vbscript_main.c \
vbsglobal.idl \ vbsglobal.idl \
vbsregexp10.idl \ vbsregexp10.idl \
vbsregexp55.idl vbsregexp55.idl
MODULE = wbemprox.dll MODULE = wbemprox.dll
IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi
C_SRCS = \ SOURCES = \
builtin.c \ builtin.c \
class.c \ class.c \
main.c \ main.c \
...@@ -14,8 +14,6 @@ C_SRCS = \ ...@@ -14,8 +14,6 @@ C_SRCS = \
services.c \ services.c \
sysrestore.c \ sysrestore.c \
table.c \ table.c \
wbemlocator.c wbemlocator.c \
wbemprox.idl \
IDL_SRCS = wbemprox.idl wql.y
BISON_SRCS = wql.y
...@@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) ...@@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@)
my $make = $makefiles{"$dir/Makefile.in"}; my $make = $makefiles{"$dir/Makefile.in"};
my $name = substr( $file, length($dir) + 1 ); my $name = substr( $file, length($dir) + 1 );
if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) if ($name =~ /\.(in|l|m|mc|po|sfd|svg|y)$/)
{ {
push @{${$make}{"=SOURCES"}}, $name; push @{${$make}{"=SOURCES"}}, $name;
next; next;
} }
elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
elsif ($name =~ /\.c$/) elsif ($name =~ /\.c$/)
{ {
push @{${$make}{"=C_SRCS"}}, $name; push @{${$make}{"=C_SRCS"}}, $name;
...@@ -394,7 +393,6 @@ sub assign_sources_to_makefiles(@) ...@@ -394,7 +393,6 @@ sub assign_sources_to_makefiles(@)
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}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_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}, "BISON_SRCS" );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment