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
be2c66d5
Commit
be2c66d5
authored
Dec 12, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Explicitly specify source directory in Makefile dependencies.
parent
ba1b572d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
14 deletions
+20
-14
Makefile.in
Makefile.in
+2
-2
aclocal.m4
aclocal.m4
+7
-4
configure
configure
+8
-5
configure.ac
configure.ac
+1
-1
makedep.c
tools/makedep.c
+2
-2
No files found.
Makefile.in
View file @
be2c66d5
...
...
@@ -32,11 +32,11 @@ all: wine
# Rules for re-running configure
config.status
:
configure
config.status
:
$(srcdir)/
configure
@
./config.status
--recheck
include/config.h
:
include/stamp-h
include/stamp-h
:
include/config.h.in config.status
include/stamp-h
:
$(srcdir)/
include/config.h.in config.status
@
./config.status include/config.h include/stamp-h
# Rules for cleaning
...
...
aclocal.m4
View file @
be2c66d5
...
...
@@ -219,12 +219,15 @@ wine_fn_depend_rules ()
ac_makedep="\$(MAKEDEP)"
ac_input=Make.vars.in:$ac_dir/Makefile.in
case $[1] in
*.in) ac_input=$ac_input:$[1] ;;
*) ac_makedep="$[1] $ac_makedep" ;;
*.in)
ac_input=$ac_input:$[1]
test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;;
*)
ac_makedep="$[1] $ac_makedep" ;;
esac
wine_fn_append_rule \
"$ac_dir/Makefile: $
ac_dir/Makefile.in
Make.vars.in config.status $ac_alldeps \$(MAKEDEP)
"$ac_dir/Makefile: $
srcdir/$ac_dir/Makefile.in $srcdir/
Make.vars.in config.status $ac_alldeps \$(MAKEDEP)
@./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend
depend: $ac_dir/depend
.PHONY: $ac_dir/depend
...
...
@@ -628,7 +631,7 @@ wine_fn_config_makerules ()
ac_rules=$[1]
ac_deps=$[2]
wine_fn_append_rule \
"$ac_rules: $ac_rules.in $ac_deps config.status
"$ac_rules: $
srcdir/$
ac_rules.in $ac_deps config.status
@./config.status $ac_rules
distclean::
\$(RM) $ac_rules"
...
...
configure
View file @
be2c66d5
...
...
@@ -16216,12 +16216,15 @@ wine_fn_depend_rules ()
ac_makedep
=
"
\$
(MAKEDEP)"
ac_input
=
Make.vars.in:
$ac_dir
/Makefile.in
case
$1
in
*
.in
)
ac_input
=
$ac_input
:
$1
;;
*
)
ac_makedep
=
"
$1
$ac_makedep
"
;;
*
.in
)
ac_input
=
$ac_input
:
$1
test
"
$srcdir
"
=
.
||
ac_alldeps
=
"
$srcdir
/
$ac_alldeps
"
;;
*
)
ac_makedep
=
"
$1
$ac_makedep
"
;;
esac
wine_fn_append_rule
\
"
$ac_dir
/Makefile:
$
ac_dir
/Makefile.in
Make.vars.in config.status
$ac_alldeps
\$
(MAKEDEP)
"
$ac_dir
/Makefile:
$
srcdir
/
$ac_dir
/Makefile.in
$srcdir
/
Make.vars.in config.status
$ac_alldeps
\$
(MAKEDEP)
@./config.status --file
$ac_dir
/Makefile:
$ac_input
&& cd
$ac_dir
&&
\$
(MAKE) depend
depend:
$ac_dir
/depend
.PHONY:
$ac_dir
/depend
...
...
@@ -16641,7 +16644,7 @@ wine_fn_config_makerules ()
ac_rules
=
$1
ac_deps
=
$2
wine_fn_append_rule
\
"
$ac_rules
:
$ac_rules
.in
$ac_deps
config.status
"
$ac_rules
:
$
srcdir
/
$
ac_rules
.in
$ac_deps
config.status
@./config.status
$ac_rules
distclean::
\$
(RM)
$ac_rules
"
...
...
@@ -16677,7 +16680,7 @@ wine_fn_append_rule "
.INIT: Makefile
.MAKEFILEDEPS:
all: Makefile
Makefile:
Makefile.in
Make.vars.in Make.rules config.status
Makefile:
$srcdir
/Makefile.in
$srcdir
/
Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile"
if
test
"x
$enable_fonts
"
!=
xno
;
then
...
...
configure.ac
View file @
be2c66d5
...
...
@@ -2667,7 +2667,7 @@ WINE_APPEND_RULE([
.INIT: Makefile
.MAKEFILEDEPS:
all: Makefile
Makefile:
Makefile.in
Make.vars.in Make.rules config.status
Makefile:
$srcdir/Makefile.in $srcdir/
Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile])
WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts)
...
...
tools/makedep.c
View file @
be2c66d5
...
...
@@ -1363,7 +1363,7 @@ static void output_sources(void)
if
(
find_src_file
(
"dlldata.o"
))
{
output
(
"dlldata.c: $(WIDL)
Makefile.in
\
n
"
);
output
(
"dlldata.c: $(WIDL)
%s
\n
"
,
src_dir
?
strmake
(
"%s/Makefile.in"
,
src_dir
)
:
"Makefile.i
n"
);
column
=
output
(
"
\t
$(WIDL) --dlldata-only -o $@"
);
LIST_FOR_EACH_ENTRY
(
source
,
&
sources
,
struct
incl_file
,
entry
)
if
(
source
->
flags
&
FLAG_IDL_PROXY
)
output_filename
(
source
->
filename
,
&
column
);
...
...
@@ -1373,7 +1373,7 @@ static void output_sources(void)
if
(
is_test
)
{
output
(
"testlist.c: $(MAKECTESTS)
Makefile.in
\
n
"
);
output
(
"testlist.c: $(MAKECTESTS)
%s
\n
"
,
src_dir
?
strmake
(
"%s/Makefile.in"
,
src_dir
)
:
"Makefile.i
n"
);
column
=
output
(
"
\t
$(MAKECTESTS) -o $@"
);
LIST_FOR_EACH_ENTRY
(
source
,
&
sources
,
struct
incl_file
,
entry
)
if
(
strendswith
(
source
->
name
,
".c"
)
&&
!
is_generated_idl
(
source
))
...
...
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