Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ffeb530c
Commit
ffeb530c
authored
Oct 14, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Always use the global SOURCES variable for .y files.
parent
94771cf0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
40 deletions
+21
-40
Makefile.in
dlls/jscript/Makefile.in
+6
-11
Makefile.in
dlls/msi/Makefile.in
+6
-11
Makefile.in
dlls/vbscript/Makefile.in
+4
-9
Makefile.in
dlls/wbemprox/Makefile.in
+4
-6
make_makefiles
tools/make_makefiles
+1
-3
No files found.
dlls/jscript/Makefile.in
View file @
ffeb530c
MODULE
=
jscript.dll
MODULE
=
jscript.dll
IMPORTS
=
oleaut32 ole32 user32 advapi32
IMPORTS
=
oleaut32 ole32 user32 advapi32
C_SRC
S
=
\
SOURCE
S
=
\
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
dlls/msi/Makefile.in
View file @
ffeb530c
...
@@ -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_SRC
S
=
\
SOURCE
S
=
\
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
dlls/vbscript/Makefile.in
View file @
ffeb530c
...
@@ -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_SRC
S
=
\
SOURCE
S
=
\
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
dlls/wbemprox/Makefile.in
View file @
ffeb530c
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_SRC
S
=
\
SOURCE
S
=
\
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
tools/make_makefiles
View file @
ffeb530c
...
@@ -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"
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment