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
6cba5c48
Commit
6cba5c48
authored
Jul 09, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Install import libraries from the top-level makefile.
parent
f64a6753
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
33 deletions
+49
-33
aclocal.m4
aclocal.m4
+24
-8
configure
configure
+24
-8
Makedll.rules.in
dlls/Makedll.rules.in
+1
-17
No files found.
aclocal.m4
View file @
6cba5c48
...
...
@@ -330,10 +330,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) lib$ac_implib.def
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
.PHONY: $ac_dir/__install-dev__
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
@cd $ac_dir && \$(MAKE) install-dev
install-dev:: $ac_dir/__install-dev__"
.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
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
install install-dev:: $ac_dir/__install-dev__
__uninstall__: $ac_dir/__uninstall__"
if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir/__install-dev__:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__
\$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
fi
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
...
...
@@ -350,10 +363,13 @@ $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
$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
.PHONY: $ac_dir/__install-dev__
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
@cd $ac_dir && \$(MAKE) install-dev
install-dev:: $ac_dir/__install-dev__"
.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
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
install install-dev:: $ac_dir/__install-dev__
__uninstall__: $ac_dir/__uninstall__"
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
...
...
configure
View file @
6cba5c48
...
...
@@ -14698,10 +14698,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
@cd
$ac_dir
&&
\$
(MAKE) lib
$ac_implib
.def
$ac_file
.
$STATIC_IMPLIBEXT
:
$ac_dir
/Makefile dummy
@cd
$ac_dir
&&
\$
(MAKE) lib
$ac_implib
.
$STATIC_IMPLIBEXT
.PHONY:
$ac_dir
/__install-dev__
$ac_dir
/__install-dev__::
$ac_dir
/Makefile __builddeps__
@cd
$ac_dir
&&
\$
(MAKE) install-dev
install-dev::
$ac_dir
/__install-dev__"
.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
$ac_dir
/__uninstall__::
\$
(RM)
\$
(DESTDIR)
\$
(dlldir)/lib
$ac_implib
.
$IMPLIBEXT
install install-dev::
$ac_dir
/__install-dev__
__uninstall__:
$ac_dir
/__uninstall__"
if
test
"
$IMPLIBEXT
"
!=
"
$STATIC_IMPLIBEXT
"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"
$ac_dir
/__install-dev__::
$ac_file
.
$STATIC_IMPLIBEXT
\$
(DESTDIR)
\$
(dlldir) __builddeps__
\$
(INSTALL_DATA)
$ac_file
.
$STATIC_IMPLIBEXT
\$
(DESTDIR)
\$
(dlldir)/lib
$ac_implib
.
$STATIC_IMPLIBEXT
$ac_dir
/__uninstall__::
\$
(RM)
\$
(DESTDIR)
\$
(dlldir)/lib
$ac_implib
.
$STATIC_IMPLIBEXT
"
fi
if
test
"x
$CROSSTEST_DISABLE
"
=
x
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
...
...
@@ -14718,10 +14731,13 @@ $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
$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
.PHONY:
$ac_dir
/__install-dev__
$ac_dir
/__install-dev__::
$ac_dir
/Makefile __builddeps__
@cd
$ac_dir
&&
\$
(MAKE) install-dev
install-dev::
$ac_dir
/__install-dev__"
.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
$ac_dir
/__uninstall__::
\$
(RM)
\$
(DESTDIR)
\$
(dlldir)/lib
$ac_implib
.
$IMPLIBEXT
install install-dev::
$ac_dir
/__install-dev__
__uninstall__:
$ac_dir
/__uninstall__"
if
test
"x
$CROSSTEST_DISABLE
"
=
x
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
...
...
dlls/Makedll.rules.in
View file @
6cba5c48
...
...
@@ -65,19 +65,6 @@ xmlpages:: $(C_SRCS) dummy
# Rules for installation
.PHONY: install_static_implib_def install_static_implib_a
.PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
$(IMPORTLIB:%=_install_/%): $(IMPORTLIBFILE) $(DESTDIR)$(dlldir) dummy
$(INSTALL_DATA) $(IMPORTLIBFILE) $(DESTDIR)$(dlldir)/$(IMPORTLIBFILE)
install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) dummy
$(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB)
install_static_implib_a:
$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)
.PHONY: install_dll install_dll.so install_dll.fake
install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy
...
...
@@ -91,11 +78,8 @@ install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy
install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT)
install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy
uninstall::
-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB)
$(RM) $(DESTDIR)$(fakedlldir)/$(MODULE)
$(RM) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE)
# Misc. rules
...
...
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