Commit 52c400e9 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 3be8b409
...@@ -27,6 +27,7 @@ VPATH = @srcdir@ ...@@ -27,6 +27,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = none MODULE = none
ALL_DIRS = @ALL_DIRS@
ALL_DLL_DIRS = @ALL_DLL_DIRS@ ALL_DLL_DIRS = @ALL_DLL_DIRS@
ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@ ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@
ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@ ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@
...@@ -36,21 +37,7 @@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ...@@ -36,21 +37,7 @@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
ALL_TOP_DIRS = @ALL_TOP_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@
# Sub-directories to run make depend/clean into # Sub-directories to run make depend/clean into
SUBDIRS = \ SUBDIRS = $(ALL_DIRS)
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)
# Sub-directories to run make all into # Sub-directories to run make all into
BUILDSUBDIRS = \ BUILDSUBDIRS = \
...@@ -181,8 +168,7 @@ distclean:: clean ...@@ -181,8 +168,7 @@ distclean:: clean
# Makefile rules # Makefile rules
ALL_MAKEFILES = @ALL_MAKEFILES@ ALL_CONFIGS = Makefile $(ALL_DIRS:%=%/Makefile) @ALL_MAKERULES@ @ALL_SYMLINKS@
ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@
$(ALL_CONFIGS): $(ALL_CONFIGS):
@./config.status $@ @./config.status $@
......
...@@ -170,8 +170,8 @@ dnl ...@@ -170,8 +170,8 @@ dnl
AC_DEFUN([WINE_CONFIG_MAKEFILE], AC_DEFUN([WINE_CONFIG_MAKEFILE],
[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\(\(.*\)/\)?Makefile$],[\2]))dnl [m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\(\(.*\)/\)?Makefile$],[\2]))dnl
m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/\(.*\)$],[\1]))dnl m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/\(.*\)$],[\1]))dnl
m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\ m4_ifval(ac_dir,[ALL_DIRS="$ALL_DIRS \\
$1"]) ac_dir"])
AS_VAR_PUSHDEF([ac_enable],m4_default([$4],[enable_]ac_name))dnl 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 \\ m4_ifval([$3],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$3],[ && ac_var="$ac_var \\
ac_dir"])) ac_dir"]))
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2098,11 +2098,11 @@ Makefile: dummy ...@@ -2098,11 +2098,11 @@ Makefile: dummy
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])
AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_MAKEFILES,"")
AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_TOOL_DIRS,"")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment