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
0dcc1cc3
Commit
0dcc1cc3
authored
Oct 28, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Expand srcdir directly into the top-level makefile.
parent
3571c067
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
24 deletions
+26
-24
aclocal.m4
aclocal.m4
+4
-4
configure
configure
+13
-12
configure.ac
configure.ac
+9
-8
No files found.
aclocal.m4
View file @
0dcc1cc3
...
...
@@ -433,7 +433,7 @@ $ac_dir/uninstall::
"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export
\$(srcdir)
/$ac_dir/$ac_name.spec
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export
$srcdir
/$ac_dir/$ac_name.spec
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
.PHONY: $ac_dir/install-dev $ac_dir/uninstall
...
...
@@ -466,9 +466,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export
\$(srcdir)
/$ac_dir/$ac_name.spec
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export
$srcdir
/$ac_dir/$ac_name.spec
$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export
\$(srcdir)
/$ac_dir/$ac_name.spec
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export
$srcdir
/$ac_dir/$ac_name.spec
.PHONY: $ac_dir/install-dev $ac_dir/uninstall
$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
...
...
@@ -481,7 +481,7 @@ __uninstall__: $ac_dir/uninstall"
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export
\$(srcdir)
/$ac_dir/$ac_name.spec"
\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export
$srcdir
/$ac_dir/$ac_name.spec"
fi
if test "$ac_name" != "$ac_implib"
...
...
configure
View file @
0dcc1cc3
...
...
@@ -5834,6 +5834,7 @@ then
MAINTAINER_MODE
=
\#
else
test
"
$srcdir
"
=
.
||
as_fn_error
$?
"Maintainer mode cannot work out of tree."
"
$LINENO
"
5
if
test
"
$FONTFORGE
"
=
"false"
;
then
as_fn_error
$?
"You need fontforge to rebuild fonts in maintainer mode."
"
$LINENO
"
5
;
fi
if
test
"
$RSVG
"
=
"false"
;
then
as_fn_error
$?
"You need rsvg to rebuild icons in maintainer mode."
"
$LINENO
"
5
;
fi
...
...
@@ -16350,7 +16351,7 @@ fi
"__builddeps__:
$ac_file
.
$IMPLIBEXT
$ac_file
.
$STATIC_IMPLIBEXT
$ac_file
.
$IMPLIBEXT
$ac_file
.
$STATIC_IMPLIBEXT
$ac_file
.cross.a:
$ac_deps
$ac_file
.def:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --def -o
\$
@ --export
\$
(srcdir)
/
$ac_dir
/
$ac_name
.spec
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --def -o
\$
@ --export
$srcdir
/
$ac_dir
/
$ac_name
.spec
$ac_file
.
$STATIC_IMPLIBEXT
:
$ac_dir
/Makefile dummy
@cd
$ac_dir
&&
\$
(MAKE) lib
$ac_implib
.
$STATIC_IMPLIBEXT
.PHONY:
$ac_dir
/install-dev
$ac_dir
/uninstall
...
...
@@ -16383,9 +16384,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
wine_fn_append_rule
\
"__builddeps__:
$ac_file
.
$IMPLIBEXT
$ac_file
.def:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --def -o
\$
@ --export
\$
(srcdir)
/
$ac_dir
/
$ac_name
.spec
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --def -o
\$
@ --export
$srcdir
/
$ac_dir
/
$ac_name
.spec
$ac_file
.a:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --implib -o
\$
@ --export
\$
(srcdir)
/
$ac_dir
/
$ac_name
.spec
\$
(WINEBUILD)
\$
(TARGETFLAGS)
$ac_implibflags
-w --implib -o
\$
@ --export
$srcdir
/
$ac_dir
/
$ac_name
.spec
.PHONY:
$ac_dir
/install-dev
$ac_dir
/uninstall
$ac_dir
/install-dev::
$ac_file
.
$IMPLIBEXT
\$
(DESTDIR)
\$
(dlldir)
\$
(INSTALL_DATA)
$ac_file
.
$IMPLIBEXT
\$
(DESTDIR)
\$
(dlldir)/lib
$ac_implib
.
$IMPLIBEXT
...
...
@@ -16398,7 +16399,7 @@ __uninstall__: $ac_dir/uninstall"
wine_fn_append_rule
\
"__builddeps__:
$ac_file
.cross.a
$ac_file
.cross.a:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(WINEBUILD)
\$
(CROSSTARGET:%=-b %)
$ac_implibflags
-w --implib -o
\$
@ --export
\$
(srcdir)
/
$ac_dir
/
$ac_name
.spec"
\$
(WINEBUILD)
\$
(CROSSTARGET:%=-b %)
$ac_implibflags
-w --implib -o
\$
@ --export
$srcdir
/
$ac_dir
/
$ac_name
.spec"
fi
if
test
"
$ac_name
"
!=
"
$ac_implib
"
...
...
@@ -17419,11 +17420,11 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in"
if
test
"x
$enable_maintainer_mode
"
=
xyes
then
wine_fn_append_rule
"
\$
(srcdir)/
configure: configure.ac aclocal.m4
cd
\$
(srcdir) &&
autoconf --warnings=all
\$
(srcdir)/
include/config.h.in: include/stamp-h.in
\$
(srcdir)/
include/stamp-h.in: configure.ac aclocal.m4
cd
\$
(srcdir) &&
autoheader --warnings=all
wine_fn_append_rule
"configure: configure.ac aclocal.m4
autoconf --warnings=all
include/config.h.in: include/stamp-h.in
include/stamp-h.in: configure.ac aclocal.m4
autoheader --warnings=all
@echo timestamp >
\$
@"
fi
...
...
@@ -17431,9 +17432,9 @@ if test "x$with_gettextpo" = xyes
then
test
"
$srcdir
"
=
.
||
as_fn_error
$?
"Rebuilding po files is not supported for out of tree builds."
"
$LINENO
"
5
wine_fn_append_rule
"ALL_POT_FILES =
$ALL_POT_FILES
\$
(LINGUAS:%=po/%.po):
\$
(srcdir)/
po/wine.pot
msgmerge --previous -q
\$
@
\$
(srcdir)/
po/wine.pot | msgattrib --no-obsolete -o
\$
@.new && mv
\$
@.new
\$
@
\$
(srcdir)/
po/wine.pot:
\$
(ALL_POT_FILES)
\$
(LINGUAS:%=po/%.po): po/wine.pot
msgmerge --previous -q
\$
@ po/wine.pot | msgattrib --no-obsolete -o
\$
@.new && mv
\$
@.new
\$
@
po/wine.pot:
\$
(ALL_POT_FILES)
msgcat -o
\$
@
\$
(ALL_POT_FILES)"
fi
...
...
configure.ac
View file @
0dcc1cc3
...
...
@@ -280,6 +280,7 @@ if test "x$enable_maintainer_mode" != "xyes"
then
AC_SUBST([MAINTAINER_MODE],[\#])
else
test "$srcdir" = . || AC_MSG_ERROR([Maintainer mode cannot work out of tree.])
if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi
if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi
...
...
@@ -3462,11 +3463,11 @@ dnl Some final makefile rules
if test "x$enable_maintainer_mode" = xyes
then
WINE_APPEND_RULE(
[
\$(srcdir)/
configure: configure.ac aclocal.m4
cd \$(srcdir) &&
autoconf --warnings=all
\$(srcdir)/
include/config.h.in: include/stamp-h.in
\$(srcdir)/
include/stamp-h.in: configure.ac aclocal.m4
cd \$(srcdir) &&
autoheader --warnings=all
[configure: configure.ac aclocal.m4
autoconf --warnings=all
include/config.h.in: include/stamp-h.in
include/stamp-h.in: configure.ac aclocal.m4
autoheader --warnings=all
@echo timestamp > \$[@]])
fi
...
...
@@ -3475,9 +3476,9 @@ then
test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.])
WINE_APPEND_RULE(
[ALL_POT_FILES =$ALL_POT_FILES
\$(LINGUAS:%=po/%.po):
\$(srcdir)/
po/wine.pot
msgmerge --previous -q \$[@]
\$(srcdir)/
po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
\$(srcdir)/
po/wine.pot: \$(ALL_POT_FILES)
\$(LINGUAS:%=po/%.po): po/wine.pot
msgmerge --previous -q \$[@] po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
po/wine.pot: \$(ALL_POT_FILES)
msgcat -o \$[@] \$(ALL_POT_FILES)])
fi
...
...
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