ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Install static libraries from the top-level makefile.

This commit is contained in:
Alexandre Julliard 2011-07-09 17:58:47 +02:00
parent bb86a35f09
commit f64a6753cb
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -26,7 +26,7 @@ EXTRASUBDIRS = \
programs programs
# Destination directories for make install # Destination directories for make install
INSTALLDIRS = $(DESTDIR)$(bindir) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir)
all: wine all: wine
@echo "Wine build complete." @echo "Wine build complete."

16
aclocal.m4 vendored
View File

@ -249,7 +249,21 @@ wine_fn_config_lib ()
ac_name=$[1] ac_name=$[1]
ac_flags=$[2] ac_flags=$[2]
ac_dir=dlls/$ac_name ac_dir=dlls/$ac_name
wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules wine_fn_config_makefile $ac_dir enable_$ac_name "$ac_flags" dlls/Makeimplib.rules
if wine_fn_has_flag install-dev $ac_flags
then :
else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a
install install-dev:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
} }

16
configure vendored
View File

@ -14616,7 +14616,21 @@ wine_fn_config_lib ()
ac_name=$1 ac_name=$1
ac_flags=$2 ac_flags=$2
ac_dir=dlls/$ac_name ac_dir=dlls/$ac_name
wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules wine_fn_config_makefile $ac_dir enable_$ac_name "$ac_flags" dlls/Makeimplib.rules
if wine_fn_has_flag install-dev $ac_flags
then :
else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a
install install-dev:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
} }

9
dlls/Makeimplib.rules.in
View File

@ -8,7 +8,6 @@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(EXTRADEFS) DEFS = -D__WINESRC__ $(EXTRADEFS)
INSTALLDIRS = $(DESTDIR)$(dlldir)
MAKEDEPFLAGS = -xo -xcross.o MAKEDEPFLAGS = -xo -xcross.o
@MAKE_RULES@ @MAKE_RULES@
@ -27,12 +26,4 @@ $(MODULE:%=lib%.cross.a): $(CROSSOBJS) Makefile.in
$(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS)
$(CROSSRANLIB) $@ $(CROSSRANLIB) $@
# Rules for installation
install install-dev:: $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)
$(INSTALL_DATA) $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a)
uninstall::
$(RM) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a)
# End of global library rules # End of global library rules