From b3ec2e5f95e36aa94785fb398775742ae6a14515 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 25 Aug 2008 14:27:03 +0200 Subject: [PATCH] makefiles: Recurse into all directories for install-lib and install-dev too. --- Make.rules.in | 3 ++- Makefile.in | 40 ++++++++++++---------------- dlls/Makefile.in | 4 --- dlls/Makeimplib.rules.in | 2 -- documentation/Makefile.in | 4 +-- fonts/Makefile.in | 2 +- include/Makefile.in | 2 +- libs/Makefile.in | 3 --- loader/Makefile.in | 2 +- programs/Makefile.in | 2 +- programs/Makeprog.rules.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winemenubuilder/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/Makefile.in | 2 +- tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 21 files changed, 36 insertions(+), 50 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b46a573e69d..d49d2a36446 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -271,7 +271,8 @@ $(SUBDIRS:%=%/__uninstall__): dummy @cd `dirname $@` && $(MAKE) uninstall install:: $(INSTALLSUBDIRS:%=%/__install__) - +install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) +install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) $(INSTALLDIRS): diff --git a/Makefile.in b/Makefile.in index 1f04019e54b..ed30f1be0b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,20 +41,16 @@ SUBDIRS = \ server \ tools -# Sub-directories to install for install-lib -INSTALLLIBSUBDIRS = \ +# Sub-directories to run make install/uninstall into +INSTALLSUBDIRS = \ $(FONTSSUBDIRS) \ + dlls \ + include \ + libs \ loader \ programs \ - server - -# Sub-directories to install for install-dev -INSTALLDEVSUBDIRS = include - -# Sub-directories to install for both install-lib and install-dev -INSTALLBOTHSUBDIRS = dlls libs tools - -INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS) + server \ + tools # Sub-directories to run make test into TESTSUBDIRS = dlls @@ -91,29 +87,27 @@ wine: $(WINEWRAPPER) install install-dev:: $(DESTDIR)$(datadir)/aclocal dummy $(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4 -install install-lib:: $(INSTALLLIBSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-lib__) - -install install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) - -uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__) +uninstall:: $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4 -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/aclocal # Dependencies between directories -all: $(INSTALLSUBDIRS) $(INSTALLBOTHSUBDIRS) +all: $(INSTALLSUBDIRS) dlls: include libs tools fonts loader server: libs tools programs: dlls include libs tools include: libs tools tools: libs -dlls/__install-lib__ dlls/__install-dev__: libs tools include -include/__install__: include libs tools -libs/__install-lib__ libs/__install-dev__: libs -fonts/__install__ loader/__install__ server/__install__: libs tools -programs/__install__: libs tools include dlls/__install-lib__ -tools/__install-lib__ tools/__install-dev__: tools +dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs tools include +fonts/__install__ fonts/__install-lib__: libs tools +include/__install__ include/__install-dev__: include libs tools +libs/__install__ libs/__install-lib__ libs/__install-dev__: libs +loader/__install__ loader/__install-lib__: libs tools +server/__install__ server/__install-lib__: libs tools +programs/__install__ programs/__install-lib__: libs tools include dlls/__install-lib__ +tools/__install__ tools/__install-lib__ tools/__install-dev__: tools RECURSE_TARGETS = \ $(SUBDIRS) \ diff --git a/dlls/Makefile.in b/dlls/Makefile.in index c9bb2393909..66806737874 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -886,10 +886,6 @@ $(WIN16_FILES:%=__install__/%): $(WIN16_FILES) $(DESTDIR)$(dlldir) dummy install install-lib:: @WIN16_INSTALL@ -install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) - -install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) - uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES) -rmdir $(DESTDIR)$(dlldir) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index b21d59aca45..380101fa63d 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -26,8 +26,6 @@ $(MODULE:%=lib%.a): $(OBJS) Makefile.in install install-dev:: $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir) $(INSTALL_DATA) $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) -install-lib:: - uninstall:: $(RM) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 9e2c7736c4b..4723a540731 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -17,9 +17,9 @@ htmlpages: html dummy sgmlpages: api-guide dummy @cd $(DLLDIR) && $(MAKE) doc-sgml -.PHONY: manpages htmlpages sgmlpages +.PHONY: manpages htmlpages sgmlpages install-man -install:: manpages $(DESTDIR)$(mandir)/man$(api_manext) +install-man:: manpages $(DESTDIR)$(mandir)/man$(api_manext) for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done clean:: diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 2f07adea135..6caad017021 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -179,7 +179,7 @@ cvgasys.fon: system.ttf $(BITMAP_FONTS): $(SFNT2FNT) -install:: $(FONTS) $(INSTALLDIRS) +install install-lib:: $(FONTS) $(INSTALLDIRS) for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(SRCDIR)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done diff --git a/include/Makefile.in b/include/Makefile.in index 115028b6e11..808a6fc9c3a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -471,7 +471,7 @@ OBJDIR_INCLUDES = $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) all: $(OBJDIR_INCLUDES) -install:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) +install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \ msvcrt/*) $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f ;; \ diff --git a/libs/Makefile.in b/libs/Makefile.in index 05b19042fe7..ad6a2fc5512 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -16,9 +16,6 @@ INSTALLSUBDIRS = \ all: $(SUBDIRS) -install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) -install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) - # Directory dependencies wine wine/__install__ wine/__install-lib__: port diff --git a/loader/Makefile.in b/loader/Makefile.in index 3179e2211a9..3f207ee78b4 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -80,7 +80,7 @@ wine-pthread-installed: $(PTHREAD_OBJS) Makefile.in $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) -install:: $(WINE_BINARIES:%=%-installed) $(MANPAGES) $(INSTALLDIRS) +install install-lib:: $(WINE_BINARIES:%=%-installed) $(MANPAGES) $(INSTALLDIRS) for f in $(WINE_BINARIES); do \ if [ "$(MAIN_BINARY)" = "$$f" ]; \ then $(INSTALL_PROGRAM) $$f-installed $(DESTDIR)$(bindir)/$(MODULE); \ diff --git a/programs/Makefile.in b/programs/Makefile.in index 3ba3660b6dc..7bd60b27da4 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -33,7 +33,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__) install-progs: # nothing to do here -install:: install-progs$(DLLEXT) $(INSTALLDIRS) +install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 2beec5133a1..9a6fad63a00 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -55,7 +55,7 @@ uninstall_prog.so: dummy uninstall_prog: dummy $(RM) $(DESTDIR)$(bindir)/$(MODULE) -install:: install_prog$(DLLEXT) +install install-lib:: install_prog$(DLLEXT) uninstall:: uninstall_prog$(DLLEXT) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index b340ecb189c..395869e1ba3 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -38,7 +38,7 @@ MANPAGES = winedbg.man all: $(MANPAGES) -install:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) +install install-lib:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winedbg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) uninstall:: diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 24d3157bba9..4894b6e92fa 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -11,7 +11,7 @@ C_SRCS = \ @MAKE_PROG_RULES@ -install:: $(DESTDIR)$(bindir) +install install-lib:: $(DESTDIR)$(bindir) $(INSTALL_SCRIPT) $(TOPSRCDIR)/tools/wineshelllink $(DESTDIR)$(bindir)/wineshelllink uninstall:: diff --git a/server/Makefile.in b/server/Makefile.in index e51a48e99b6..044c0c177ce 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -74,7 +74,7 @@ wineserver: $(OBJS) wineserver-installed: $(OBJS) $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_INSTALL) -install:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) +install install-lib:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver $(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) diff --git a/tools/Makefile.in b/tools/Makefile.in index c7a3ebfb90e..ea4e0078228 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -85,7 +85,7 @@ install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS) $(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) -install install-dev:: $(INSTALLSUBDIRS:%=%/__install__) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) +install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker $(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index a17a525fba2..358756cae57 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -33,7 +33,7 @@ all: $(PROGRAMS) $(MANPAGES) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(INSTALL_DATA) widl.man $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 77f36917113..d78dfe0cb8e 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -28,7 +28,7 @@ all: $(PROGRAMS) $(MANPAGES) winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) $(INSTALL_DATA) winebuild.man $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 63af00b5860..6f7f1d28c6b 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -37,7 +37,7 @@ all: $(PROGRAMS) $(MANPAGES) winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(INSTALL_DATA) winedump.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext) $(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index fd7691ddea1..6650ed13566 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -42,7 +42,7 @@ winegcc$(EXEEXT): winegcc.o utils.o winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ -install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) +install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) winegcc$(EXEEXT) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index b78f12b4d52..b54a19f9ebf 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -29,7 +29,7 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LDRPATH_INSTALL) -install:: wmc-installed $(MANPAGES) $(INSTALLDIRS) +install install-dev:: wmc-installed $(MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) wmc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 191bf97c75b..911d131df15 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -34,7 +34,7 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LDRPATH_INSTALL) -install:: wrc-installed $(MANPAGES) $(INSTALLDIRS) +install install-dev:: wrc-installed $(MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) wrc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT)