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
fb43551a
Commit
fb43551a
authored
Feb 26, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Expand the ln -s command into the makefiles.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f74638f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
makedep.c
tools/makedep.c
+7
-5
No files found.
tools/makedep.c
View file @
fb43551a
...
@@ -147,6 +147,7 @@ static const char *rsvg;
...
@@ -147,6 +147,7 @@ static const char *rsvg;
static
const
char
*
icotool
;
static
const
char
*
icotool
;
static
const
char
*
dlltool
;
static
const
char
*
dlltool
;
static
const
char
*
msgfmt
;
static
const
char
*
msgfmt
;
static
const
char
*
ln_s
;
struct
makefile
struct
makefile
{
{
...
@@ -2150,7 +2151,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct
...
@@ -2150,7 +2151,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct
install_sh
,
src_dir_path
(
make
,
file
),
dest
+
1
);
install_sh
,
src_dir_path
(
make
,
file
),
dest
+
1
);
break
;
break
;
case
'y'
:
/* symlink */
case
'y'
:
/* symlink */
output
(
"
\t
rm -f $(DESTDIR)%s &&
$(LN_S) %s $(DESTDIR)%s
\n
"
,
dest
+
1
,
file
,
dest
+
1
);
output
(
"
\t
rm -f $(DESTDIR)%s &&
%s %s $(DESTDIR)%s
\n
"
,
dest
+
1
,
ln_s
,
file
,
dest
+
1
);
break
;
break
;
default:
default:
assert
(
0
);
assert
(
0
);
...
@@ -2187,14 +2188,14 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent,
...
@@ -2187,14 +2188,14 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent,
dir
=
obj_dir_path
(
parent
,
"dlls"
);
dir
=
obj_dir_path
(
parent
,
"dlls"
);
lib
=
strmake
(
"lib%s.%s"
,
make
->
importlib
,
*
dll_ext
?
"def"
:
"a"
);
lib
=
strmake
(
"lib%s.%s"
,
make
->
importlib
,
*
dll_ext
?
"def"
:
"a"
);
output
(
"%s/%s: %s
\n
"
,
dir
,
lib
,
base_dir_path
(
make
,
lib
));
output
(
"%s/%s: %s
\n
"
,
dir
,
lib
,
base_dir_path
(
make
,
lib
));
output
(
"
\t
rm -f $@ &&
$(LN_S) %s/%s $@
\n
"
,
make
->
base_dir
+
strlen
(
"dlls/"
),
lib
);
output
(
"
\t
rm -f $@ &&
%s %s/%s $@
\n
"
,
ln_s
,
make
->
base_dir
+
strlen
(
"dlls/"
),
lib
);
strarray_add
(
&
ret
,
strmake
(
"%s/%s"
,
dir
,
lib
));
strarray_add
(
&
ret
,
strmake
(
"%s/%s"
,
dir
,
lib
));
if
(
crosstarget
&&
!
make
->
is_win16
)
if
(
crosstarget
&&
!
make
->
is_win16
)
{
{
lib
=
strmake
(
"lib%s.cross.a"
,
make
->
importlib
);
lib
=
strmake
(
"lib%s.cross.a"
,
make
->
importlib
);
output
(
"%s/%s: %s
\n
"
,
dir
,
lib
,
base_dir_path
(
make
,
lib
));
output
(
"%s/%s: %s
\n
"
,
dir
,
lib
,
base_dir_path
(
make
,
lib
));
output
(
"
\t
rm -f $@ &&
$(LN_S) %s/%s $@
\n
"
,
make
->
base_dir
+
strlen
(
"dlls/"
),
lib
);
output
(
"
\t
rm -f $@ &&
%s %s/%s $@
\n
"
,
ln_s
,
make
->
base_dir
+
strlen
(
"dlls/"
),
lib
);
strarray_add
(
&
ret
,
strmake
(
"%s/%s"
,
dir
,
lib
));
strarray_add
(
&
ret
,
strmake
(
"%s/%s"
,
dir
,
lib
));
}
}
return
ret
;
return
ret
;
...
@@ -2837,7 +2838,7 @@ static struct strarray output_sources( const struct makefile *make )
...
@@ -2837,7 +2838,7 @@ static struct strarray output_sources( const struct makefile *make )
for
(
i
=
1
;
i
<
names
.
count
;
i
++
)
for
(
i
=
1
;
i
<
names
.
count
;
i
++
)
{
{
output
(
"%s: %s
\n
"
,
obj_dir_path
(
make
,
names
.
str
[
i
]
),
obj_dir_path
(
make
,
names
.
str
[
i
-
1
]
));
output
(
"%s: %s
\n
"
,
obj_dir_path
(
make
,
names
.
str
[
i
]
),
obj_dir_path
(
make
,
names
.
str
[
i
-
1
]
));
output
(
"
\t
rm -f $@ &&
$(LN_S) %s $@
\n
"
,
names
.
str
[
i
-
1
]
);
output
(
"
\t
rm -f $@ &&
%s %s $@
\n
"
,
ln_s
,
names
.
str
[
i
-
1
]
);
add_install_rule
(
make
,
install_rules
,
names
.
str
[
i
],
names
.
str
[
i
-
1
],
add_install_rule
(
make
,
install_rules
,
names
.
str
[
i
],
names
.
str
[
i
-
1
],
strmake
(
"y$(libdir)/%s"
,
names
.
str
[
i
]
));
strmake
(
"y$(libdir)/%s"
,
names
.
str
[
i
]
));
}
}
...
@@ -2998,7 +2999,7 @@ static struct strarray output_sources( const struct makefile *make )
...
@@ -2998,7 +2999,7 @@ static struct strarray output_sources( const struct makefile *make )
{
{
output_filenames_obj_dir
(
make
,
symlinks
);
output_filenames_obj_dir
(
make
,
symlinks
);
output
(
": %s
\n
"
,
obj_dir_path
(
make
,
program
));
output
(
": %s
\n
"
,
obj_dir_path
(
make
,
program
));
output
(
"
\t
rm -f $@ &&
$(LN_S) %s $@
\n
"
,
obj_dir_path
(
make
,
program
));
output
(
"
\t
rm -f $@ &&
%s %s $@
\n
"
,
ln_s
,
obj_dir_path
(
make
,
program
));
strarray_addall
(
&
all_targets
,
symlinks
);
strarray_addall
(
&
all_targets
,
symlinks
);
}
}
...
@@ -3542,6 +3543,7 @@ int main( int argc, char *argv[] )
...
@@ -3542,6 +3543,7 @@ int main( int argc, char *argv[] )
icotool
=
get_expanded_make_variable
(
top_makefile
,
"ICOTOOL"
);
icotool
=
get_expanded_make_variable
(
top_makefile
,
"ICOTOOL"
);
dlltool
=
get_expanded_make_variable
(
top_makefile
,
"DLLTOOL"
);
dlltool
=
get_expanded_make_variable
(
top_makefile
,
"DLLTOOL"
);
msgfmt
=
get_expanded_make_variable
(
top_makefile
,
"MSGFMT"
);
msgfmt
=
get_expanded_make_variable
(
top_makefile
,
"MSGFMT"
);
ln_s
=
get_expanded_make_variable
(
top_makefile
,
"LN_S"
);
if
(
root_src_dir
&&
!
strcmp
(
root_src_dir
,
"."
))
root_src_dir
=
NULL
;
if
(
root_src_dir
&&
!
strcmp
(
root_src_dir
,
"."
))
root_src_dir
=
NULL
;
if
(
tools_dir
&&
!
strcmp
(
tools_dir
,
"."
))
tools_dir
=
NULL
;
if
(
tools_dir
&&
!
strcmp
(
tools_dir
,
"."
))
tools_dir
=
NULL
;
...
...
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