makefiles: Always use the global SOURCES variable for .y files.
This commit is contained in:
parent
94771cf07a
commit
ffeb530cc0
5 changed files with 21 additions and 40 deletions
|
@ -1,10 +1,11 @@
|
|||
MODULE = jscript.dll
|
||||
IMPORTS = oleaut32 ole32 user32 advapi32
|
||||
|
||||
C_SRCS = \
|
||||
SOURCES = \
|
||||
activex.c \
|
||||
array.c \
|
||||
bool.c \
|
||||
cc_parser.y \
|
||||
compile.c \
|
||||
date.c \
|
||||
decode.c \
|
||||
|
@ -15,7 +16,10 @@ C_SRCS = \
|
|||
function.c \
|
||||
global.c \
|
||||
jscript.c \
|
||||
jscript.rc \
|
||||
jscript_classes.idl \
|
||||
jscript_main.c \
|
||||
jsglobal.idl \
|
||||
json.c \
|
||||
jsregexp.c \
|
||||
jsstr.c \
|
||||
|
@ -24,17 +28,8 @@ C_SRCS = \
|
|||
math.c \
|
||||
number.c \
|
||||
object.c \
|
||||
parser.y \
|
||||
regexp.c \
|
||||
set.c \
|
||||
string.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
|
|||
|
||||
EXTRAIDLFLAGS = --prefix-server=s_
|
||||
|
||||
C_SRCS = \
|
||||
SOURCES = \
|
||||
action.c \
|
||||
alter.c \
|
||||
appsearch.c \
|
||||
assembly.c \
|
||||
automation.c \
|
||||
classes.c \
|
||||
cond.y \
|
||||
create.c \
|
||||
custom.c \
|
||||
database.c \
|
||||
|
@ -26,8 +27,10 @@ C_SRCS = \
|
|||
install.c \
|
||||
media.c \
|
||||
msi.c \
|
||||
msi.rc \
|
||||
msi_main.c \
|
||||
msiquery.c \
|
||||
msiserver.idl \
|
||||
package.c \
|
||||
patch.c \
|
||||
record.c \
|
||||
|
@ -35,6 +38,7 @@ C_SRCS = \
|
|||
script.c \
|
||||
select.c \
|
||||
source.c \
|
||||
sql.y \
|
||||
storages.c \
|
||||
streams.c \
|
||||
string.c \
|
||||
|
@ -43,14 +47,5 @@ C_SRCS = \
|
|||
tokenize.c \
|
||||
update.c \
|
||||
upgrade.c \
|
||||
where.c
|
||||
|
||||
IDL_SRCS = \
|
||||
msiserver.idl \
|
||||
where.c \
|
||||
winemsi.idl
|
||||
|
||||
BISON_SRCS = \
|
||||
cond.y \
|
||||
sql.y
|
||||
|
||||
RC_SRCS = msi.rc
|
||||
|
|
|
@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32
|
|||
|
||||
EXTRADLLFLAGS = -Wb,--prefer-native
|
||||
|
||||
C_SRCS = \
|
||||
SOURCES = \
|
||||
compile.c \
|
||||
global.c \
|
||||
interp.c \
|
||||
lex.c \
|
||||
parser.y \
|
||||
regexp.c \
|
||||
utils.c \
|
||||
vbdisp.c \
|
||||
vbregexp.c \
|
||||
vbscript.c \
|
||||
vbscript_main.c
|
||||
|
||||
BISON_SRCS = \
|
||||
parser.y
|
||||
|
||||
RC_SRCS = vbscript.rc
|
||||
|
||||
IDL_SRCS = \
|
||||
vbscript.rc \
|
||||
vbscript_classes.idl \
|
||||
vbscript_main.c \
|
||||
vbsglobal.idl \
|
||||
vbsregexp10.idl \
|
||||
vbsregexp55.idl
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
MODULE = wbemprox.dll
|
||||
IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi
|
||||
|
||||
C_SRCS = \
|
||||
SOURCES = \
|
||||
builtin.c \
|
||||
class.c \
|
||||
main.c \
|
||||
|
@ -14,8 +14,6 @@ C_SRCS = \
|
|||
services.c \
|
||||
sysrestore.c \
|
||||
table.c \
|
||||
wbemlocator.c
|
||||
|
||||
IDL_SRCS = wbemprox.idl
|
||||
|
||||
BISON_SRCS = wql.y
|
||||
wbemlocator.c \
|
||||
wbemprox.idl \
|
||||
wql.y
|
||||
|
|
|
@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@)
|
|||
my $make = $makefiles{"$dir/Makefile.in"};
|
||||
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;
|
||||
next;
|
||||
}
|
||||
elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
|
||||
elsif ($name =~ /\.c$/)
|
||||
{
|
||||
push @{${$make}{"=C_SRCS"}}, $name;
|
||||
|
@ -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}, "RC_SRCS" );
|
||||
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" );
|
||||
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue