makefiles: Auto-generate the list of all subdirectories too.

This commit is contained in:
Alexandre Julliard 2010-02-10 19:57:02 +01:00
parent 3be8b409ae
commit 52c400e97e
4 changed files with 1085 additions and 1099 deletions

View File

@ -27,6 +27,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = none
ALL_DIRS = @ALL_DIRS@
ALL_DLL_DIRS = @ALL_DLL_DIRS@
ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@
ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@
@ -36,21 +37,7 @@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
ALL_TOP_DIRS = @ALL_TOP_DIRS@
# Sub-directories to run make depend/clean into
SUBDIRS = \
documentation \
fonts \
include \
libs/port \
libs/wine \
libs/wpp \
loader \
programs \
server \
$(ALL_TOOL_DIRS) \
$(ALL_STATICLIB_DIRS) \
$(ALL_DLL_DIRS) \
$(ALL_PROGRAM_DIRS) \
$(ALL_TEST_DIRS)
SUBDIRS = $(ALL_DIRS)
# Sub-directories to run make all into
BUILDSUBDIRS = \
@ -181,8 +168,7 @@ distclean:: clean
# Makefile rules
ALL_MAKEFILES = @ALL_MAKEFILES@
ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@
ALL_CONFIGS = Makefile $(ALL_DIRS:%=%/Makefile) @ALL_MAKERULES@ @ALL_SYMLINKS@
$(ALL_CONFIGS):
@./config.status $@

4
aclocal.m4 vendored
View File

@ -170,8 +170,8 @@ dnl
AC_DEFUN([WINE_CONFIG_MAKEFILE],
[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\(\(.*\)/\)?Makefile$],[\2]))dnl
m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/\(.*\)$],[\1]))dnl
m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\
$1"])
m4_ifval(ac_dir,[ALL_DIRS="$ALL_DIRS \\
ac_dir"])
AS_VAR_PUSHDEF([ac_enable],m4_default([$4],[enable_]ac_name))dnl
m4_ifval([$3],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$3],[ && ac_var="$ac_var \\
ac_dir"]))

2158
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -2098,11 +2098,11 @@ Makefile: dummy
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])
AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_MAKEFILES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")