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
83eb4fd9
Commit
83eb4fd9
authored
Sep 23, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate dependencies for symlinks that are needed at build time.
parent
51acdc6b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
36 deletions
+41
-36
Makefile.in
Makefile.in
+0
-2
aclocal.m4
aclocal.m4
+20
-9
configure
configure
+14
-15
configure.ac
configure.ac
+7
-10
No files found.
Makefile.in
View file @
83eb4fd9
...
...
@@ -77,8 +77,6 @@ tools/wmc tools/wrc: tools
tools tools/wmc tools/wrc
:
libs/wine
tools/widl tools/wmc tools/wrc
:
libs/wpp
dlls/shell32/Makefile dlls/shell32/__depend__
:
dlls/shell32/AUTHORS
$(MAKEDEP)
:
include/config.h
@
cd
$(TOOLSDIR)
/tools
&&
$(MAKE)
makedep
$(TOOLSEXT)
...
...
aclocal.m4
View file @
83eb4fd9
...
...
@@ -599,12 +599,20 @@ distclean::
wine_fn_config_symlink ()
{
ac_link=$[1]
ac_linkdir=
if test "x$[1]" = "x-d"
then
ac_linkdir=$[2]
shift; shift
fi
ac_links=$[@]
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_link:
@./config.status
$ac_link
"$ac_link
s
:
@./config.status
\$[@]
distclean::
\$(RM) $ac_link"
\$(RM) $ac_links"
test -n "$ac_linkdir" || return
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links"
}
if test "x$CROSSTEST_DISABLE" != x
...
...
@@ -635,13 +643,16 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
dnl **** Create symlinks from config.status ****
dnl
dnl Usage: WINE_CONFIG_SYMLINK(
name,target,enab
le)
dnl Usage: WINE_CONFIG_SYMLINK(
target,src,files,enable,srcfi
le)
dnl
AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
m4_ifval([$3],[if test "x$[$3]" != xno; then
])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[
fi])])
m4_ifval([$4],[if test "x$[$4]" != xno; then
])m4_foreach([f],[$3],
[AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl
m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl
wine_fn_config_symlink[]m4_if([$1],[$2],,m4_ifval([$1],[ -d $1]))[]m4_foreach([f],[$3],[ ]m4_ifval([$1],[$1/])f)m4_ifval([$4],[
fi])[]dnl
])])
dnl **** Create a make rules file from config.status ****
dnl
...
...
configure
View file @
83eb4fd9
...
...
@@ -15830,12 +15830,20 @@ distclean::
wine_fn_config_symlink
()
{
ac_link
=
$1
ac_linkdir
=
if
test
"x
$1
"
=
"x-d"
then
ac_linkdir
=
$2
shift
;
shift
fi
ac_links
=
$@
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"
$ac_link
:
@./config.status
$ac_link
"
$ac_link
s
:
@./config.status
\$
@
distclean::
\$
(RM)
$ac_link
"
\$
(RM)
$ac_links
"
test
-n
"
$ac_linkdir
"
||
return
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"
$ac_linkdir
/Makefile
$ac_linkdir
/__depend__:
$ac_links
"
}
if
test
"x
$CROSSTEST_DISABLE
"
!=
x
...
...
@@ -15845,24 +15853,15 @@ then
@echo
\"
crosstest is not supported (mingw not installed?)
\"
&& false"
fi
ac_config_links
=
"
$ac_config_links
dlls/shell32/AUTHORS:AUTHORS"
wine_fn_config_symlink dlls/shell32/AUTHORS
wine_fn_config_symlink
-d
dlls/shell32
dlls/shell32/AUTHORS
ac_config_links
=
"
$ac_config_links
dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink dlls/wineps.drv/generic.ppd
if
test
"x
$enable_fonts
"
!=
xno
;
then
ac_config_links
=
"
$ac_config_links
fonts/marlett.ttf:fonts/marlett.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink fonts/marlett.ttf
fi
if
test
"x
$enable_fonts
"
!=
xno
;
then
ac_config_links
=
"
$ac_config_links
fonts/symbol.ttf:fonts/symbol.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink fonts/symbol.ttf
fi
if
test
"x
$enable_fonts
"
!=
xno
;
then
ac_config_links
=
"
$ac_config_links
fonts/tahoma.ttf:fonts/tahoma.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink fonts/tahoma.ttf
fi
if
test
"x
$enable_fonts
"
!=
xno
;
then
ac_config_links
=
"
$ac_config_links
fonts/tahomabd.ttf:fonts/tahomabd.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink fonts/tahomabd.ttf
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink fonts/
marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/
tahomabd.ttf
fi
ac_config_links
=
"
$ac_config_links
po/LINGUAS:po/LINGUAS"
test
"
$srcdir
"
=
"."
||
wine_fn_config_symlink po/LINGUAS
...
...
configure.ac
View file @
83eb4fd9
...
...
@@ -2554,16 +2554,13 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
WINE_CONFIG_SYMLINK(dlls/shell32/AUTHORS,AUTHORS)
WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd)
WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(po/LINGUAS)
WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools)
WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,enable_win64)
WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS])
WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd])
WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts)
WINE_CONFIG_SYMLINK(po,po,[LINGUAS])
WINE_CONFIG_SYMLINK(tools,tools,[l_intl.nls],enable_tools)
WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper)
WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
...
...
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