Module: wine Branch: master Commit: 6cba5c48d9315ae2e7e369e3b7ee36789c8e3ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cba5c48d9315ae2e7e369e3b7...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jul 9 18:01:42 2011 +0200
makefiles: Install import libraries from the top-level makefile.
---
aclocal.m4 | 32 ++++++++++++++++++++++++-------- configure | 32 ++++++++++++++++++++++++-------- dlls/Makedll.rules.in | 18 +----------------- 3 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 index 0fc84fe..01bfa77 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -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 \ diff --git a/configure b/configure index 2a82bb5..61efbd9 100755 --- a/configure +++ b/configure @@ -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 \ diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3a9af70..52e006e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -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