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
180bc4b8
Commit
180bc4b8
authored
Dec 12, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Explicitly specify source directory in spec file dependencies.
parent
be2c66d5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
Make.rules.in
Make.rules.in
+2
-2
aclocal.m4
aclocal.m4
+4
-4
configure
configure
+6
-6
configure.ac
configure.ac
+2
-2
No files found.
Make.rules.in
View file @
180bc4b8
...
...
@@ -69,10 +69,10 @@ $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o)
$(RANLIB) $@
$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o)
$(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(
srcdir)/$(
MAINSPEC) $(IMPLIB_SRCS:.c=.o)
$(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o)
$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o)
$(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(
srcdir)/$(
MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o)
$(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o)
# Rules for dependencies
...
...
aclocal.m4
View file @
180bc4b8
...
...
@@ -432,7 +432,7 @@ $ac_dir/uninstall::
wine_fn_append_rule \
"__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)
$ac_file.def: $
srcdir/$
ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(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
...
...
@@ -465,9 +465,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
then
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
$ac_file.def: $
srcdir/$
ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(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)
$ac_file.a: $
srcdir/$
ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(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)
...
...
@@ -480,7 +480,7 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
$ac_file.cross.a: $
srcdir/$
ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec"
fi
...
...
configure
View file @
180bc4b8
...
...
@@ -16137,9 +16137,9 @@ fi
MAKE_DLL_RULES
=
"
DLLFLAGS =
$DLLFLAGS
MAINSPEC =
\$
(MODULE:%.dll=%).spec
MAINSPEC =
\$
(
srcdir)/
\$
(
MODULE:%.dll=%).spec
IDL_TLB_RES =
\$
(IDL_TLB_SRCS:.idl=_t.res)
MODULEFLAGS = -shared
\$
(
srcdir)/
\$
(
MAINSPEC)
\$
(EXTRADLLFLAGS)
MODULEFLAGS = -shared
\$
(MAINSPEC)
\$
(EXTRADLLFLAGS)
all:
$deps
...
...
@@ -16439,7 +16439,7 @@ fi
wine_fn_append_rule
\
"__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)
$ac_file
.def:
$
srcdir
/
$
ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(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
...
...
@@ -16472,9 +16472,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
then
wine_fn_append_rule
\
"__builddeps__:
$ac_file
.
$IMPLIBEXT
$ac_file
.def:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
$ac_file
.def:
$
srcdir
/
$
ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(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)
$ac_file
.a:
$
srcdir
/
$
ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(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)
...
...
@@ -16487,7 +16487,7 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule
\
"__builddeps__:
$ac_file
.cross.a
$ac_file
.cross.a:
$ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
$ac_file
.cross.a:
$
srcdir
/
$
ac_dir
/
$ac_name
.spec
$ac_dir
/Makefile
\$
(WINEBUILD)
\$
(WINEBUILD)
\$
(CROSSTARGET:%=-b %)
$ac_implibflags
-w --implib -o
\$
@ --export
$srcdir
/
$ac_dir
/
$ac_name
.spec"
fi
...
...
configure.ac
View file @
180bc4b8
...
...
@@ -2610,9 +2610,9 @@ fi
AC_SUBST(MAKE_DLL_RULES,"
DLLFLAGS = $DLLFLAGS
MAINSPEC = \$(MODULE:%.dll=%).spec
MAINSPEC = \$(
srcdir)/\$(
MODULE:%.dll=%).spec
IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res)
MODULEFLAGS = -shared \$(
srcdir)/\$(
MAINSPEC) \$(EXTRADLLFLAGS)
MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS)
all: $deps
...
...
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