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

makefiles: Install bindir programs from the top-level makefile.

This commit is contained in:
Alexandre Julliard 2010-03-26 09:24:33 +01:00
parent 719d904e35
commit 2fb302188d
5 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -26,6 +26,9 @@ VPATH = @srcdir@
# Sub-directories that don't have a makefile # Sub-directories that don't have a makefile
EXTRASUBDIRS = dlls libs EXTRASUBDIRS = dlls libs
# Destination directories for make install
INSTALLDIRS = $(DESTDIR)$(bindir)
all: wine all: wine
@echo "Wine build complete." @echo "Wine build complete."

14
aclocal.m4 vendored
View File

@ -151,7 +151,6 @@ Makefile: Makefile.in Make.rules config.status
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
wine_fn_append_file () wine_fn_append_file ()
{ {
@ -291,14 +290,19 @@ wine_fn_config_program ()
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)" @cd programs/$ac_dir && \$(MAKE)"
if test -n "$ac_install" test -n "$ac_install" || return
then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__ "install install-lib:: programs/$ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install @cd programs/$ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile uninstall:: programs/$ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall" @cd programs/$ac_dir && \$(MAKE) uninstall"
test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
uninstall::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
fi]) fi])
} }

18
configure vendored
View File

@ -596,7 +596,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_TEST_BINARIES ALL_TEST_BINARIES
ALL_WINETEST_DEPENDS ALL_WINETEST_DEPENDS
LDAPLIBS LDAPLIBS
@ -13854,8 +13853,6 @@ ALL_WINETEST_DEPENDS="# Test binaries"
ALL_TEST_BINARIES="" ALL_TEST_BINARIES=""
ALL_PROGRAM_BIN_INSTALL_DIRS=""
wine_fn_append_file () wine_fn_append_file ()
{ {
@ -14006,14 +14003,19 @@ else
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)" @cd programs/$ac_dir && \$(MAKE)"
if test -n "$ac_install" test -n "$ac_install" || return
then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__ "install install-lib:: programs/$ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install @cd programs/$ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile uninstall:: programs/$ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall" @cd programs/$ac_dir && \$(MAKE) uninstall"
test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
uninstall::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
fi fi
fi fi
} }
@ -14704,8 +14706,6 @@ ac_config_commands="$ac_config_commands Makefile"
ac_config_files="$ac_config_files Make.tmp:Makefile.in" ac_config_files="$ac_config_files Make.tmp:Makefile.in"
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
-rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)" -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)"

3
configure.ac
View File

@ -2713,9 +2713,6 @@ _WINE_EOF
AC_CONFIG_FILES([Make.tmp:Makefile.in]) AC_CONFIG_FILES([Make.tmp:Makefile.in])
dnl Don't install in bin dir for Windows build
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
dnl Some final makefile rules dnl Some final makefile rules
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
[uninstall:: [uninstall::

21
programs/Makefile.in
View File

@ -3,11 +3,6 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
ALL_INSTALLS = @ALL_PROGRAM_BIN_INSTALL_DIRS@
INSTALLPROGS = $(ALL_INSTALLS:programs/%=%)
INSTALLDIRS = $(DESTDIR)$(bindir)
PROGRAMS = wineapploader PROGRAMS = wineapploader
@MAKE_RULES@ @MAKE_RULES@
@ -16,19 +11,3 @@ all: $(PROGRAMS)
wineapploader: wineapploader.in wineapploader: wineapploader.in
sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
# Rules for installation
.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy
$(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@`
install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
install-progs: # nothing to do here
@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
uninstall::
-cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS)
-rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)