Improved support for Makefiles that need to recurse in subdirectories.
diff --git a/Makefile.in b/Makefile.in
index fd5a4a3..998bf5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,9 +23,7 @@
SOVERSION = 1.0
SONAME = libwine.so
-TOOLSUBDIRS = \
- tools \
- tools/wrc
+TOOLSUBDIRS = tools
LIBSUBDIRS = \
controls \
@@ -74,16 +72,14 @@
windows/x11drv/wineclipsrv
# Sub-directories to run make into
-BUILDSUBDIRS = \
+SUBDIRS = \
$(TOOLSUBDIRS) \
$(LIBSUBDIRS) \
$(DLLDIR) \
$(EMUSUBDIRS) \
$(PROGSUBDIRS) \
- $(DOCSUBDIRS)
-
-# Sub-directories to run make depend into
-DEPENDSUBDIRS = $(LIBSUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS)
+ $(DOCSUBDIRS) \
+ include
# Sub-directories to run make install into
INSTALLSUBDIRS = $(DLLDIR) $(DOCSUBDIRS) $(INCSUBDIRS)
@@ -91,9 +87,6 @@
# Sub-directories to run make lint into
LINTSUBDIRS = $(LIBSUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS)
-# Extra sub-directories to clean
-CLEANSUBDIRS = dlls include include/bitmaps include/wine tools/cvdump
-
LIBOBJS = \
controls/controls.o \
console/console.o \
@@ -201,9 +194,6 @@
$(EMUOBJS) $(LIBOBJS) $(DLLOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy
@cd `dirname $@` && $(MAKE) `basename $@`
-$(BUILDSUBDIRS): dummy
- @cd $@ && $(MAKE)
-
$(LIBLINTS) $(EMULINTS): dummy
@cd `dirname $@` && $(MAKE) lint
@@ -220,9 +210,6 @@
uninstall::
for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done
-depend::
- for i in $(DEPENDSUBDIRS); do (cd $$i && $(MAKE) depend) || exit 1; done
-
checklink::
@cd dlls && $(MAKE) checklink
@@ -238,8 +225,6 @@
for i in $(LIBSUBDIRS); do (cd $$i && $(MAKE) html); done
clean::
- for i in $(BUILDSUBDIRS); do (cd $$i && $(MAKE) clean) || exit 1; done
- for i in $(CLEANSUBDIRS); do (cd $$i && $(RM) $(CLEAN_FILES)); done
$(RM) wine wine.sym libwine.so.1.0 TAGS
distclean: clean
