makefiles: Install import libraries from the top-level makefile.
This commit is contained in:
parent
f64a6753cb
commit
6cba5c48d9
|
@ -330,10 +330,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
|
||||||
@cd $ac_dir && \$(MAKE) lib$ac_implib.def
|
@cd $ac_dir && \$(MAKE) lib$ac_implib.def
|
||||||
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
|
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
|
||||||
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
|
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
|
||||||
.PHONY: $ac_dir/__install-dev__
|
.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__
|
||||||
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
|
$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
|
||||||
@cd $ac_dir && \$(MAKE) install-dev
|
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
|
||||||
install-dev:: $ac_dir/__install-dev__"
|
$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
|
if test "x$CROSSTEST_DISABLE" = x
|
||||||
then
|
then
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
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
|
\$(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: $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__
|
.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__
|
||||||
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
|
$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
|
||||||
@cd $ac_dir && \$(MAKE) install-dev
|
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
|
||||||
install-dev:: $ac_dir/__install-dev__"
|
$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
|
if test "x$CROSSTEST_DISABLE" = x
|
||||||
then
|
then
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||||
|
|
|
@ -14698,10 +14698,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
|
||||||
@cd $ac_dir && \$(MAKE) lib$ac_implib.def
|
@cd $ac_dir && \$(MAKE) lib$ac_implib.def
|
||||||
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
|
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
|
||||||
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
|
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
|
||||||
.PHONY: $ac_dir/__install-dev__
|
.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__
|
||||||
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
|
$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
|
||||||
@cd $ac_dir && \$(MAKE) install-dev
|
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
|
||||||
install-dev:: $ac_dir/__install-dev__"
|
$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
|
if test "x$CROSSTEST_DISABLE" = x
|
||||||
then
|
then
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
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
|
\$(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: $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__
|
.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__
|
||||||
$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__
|
$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
|
||||||
@cd $ac_dir && \$(MAKE) install-dev
|
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
|
||||||
install-dev:: $ac_dir/__install-dev__"
|
$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
|
if test "x$CROSSTEST_DISABLE" = x
|
||||||
then
|
then
|
||||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||||
|
|
|
@ -65,19 +65,6 @@ xmlpages:: $(C_SRCS) dummy
|
||||||
|
|
||||||
# Rules for installation
|
# 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
|
.PHONY: install_dll install_dll.so install_dll.fake
|
||||||
|
|
||||||
install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy
|
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-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT)
|
||||||
|
|
||||||
install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy
|
|
||||||
|
|
||||||
uninstall::
|
uninstall::
|
||||||
-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB)
|
$(RM) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE)
|
||||||
$(RM) $(DESTDIR)$(fakedlldir)/$(MODULE)
|
|
||||||
|
|
||||||
# Misc. rules
|
# Misc. rules
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue