makefiles: Recurse into all directories for install-lib and install-dev too.

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):

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) \

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)

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)
 

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::

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
 

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 ;; \

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

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); \

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)

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)
 

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::

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::

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)

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)
 

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)
 

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)
 

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

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)

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)
 

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)