ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Build the tools subdirectories directly from the top-level makefile.

This commit is contained in:
Alexandre Julliard 2010-02-08 20:47:07 +01:00
parent bb26242f4e
commit 4d3b0205f5
5 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile.in
View File

@ -27,6 +27,8 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = none MODULE = none
ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
# Sub-directories to run make depend/clean into # Sub-directories to run make depend/clean into
SUBDIRS = \ SUBDIRS = \
dlls \ dlls \
@ -39,10 +41,10 @@ SUBDIRS = \
loader \ loader \
programs \ programs \
server \ server \
tools $(ALL_TOOL_DIRS)
# Sub-directories to run make install/uninstall into # Sub-directories to run make install/uninstall into
INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@ INSTALLSUBDIRS = libs/wine $(ALL_TOOL_DIRS) @ALL_TOP_DIRS@
# Sub-directories to run make test into # Sub-directories to run make test into
TESTSUBDIRS = dlls TESTSUBDIRS = dlls
@ -81,15 +83,22 @@ uninstall::
all: $(INSTALLSUBDIRS) all: $(INSTALLSUBDIRS)
dlls programs: libs/port libs/wine libs/wpp tools include # dependencies needed to build any dll or program
loader server: libs/port libs/wine tools __builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include
fonts include: tools .PHONY: __builddeps__
programs: dlls
tools: libs/port libs/wine libs/wpp
libs/wine: libs/port
dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs/port libs/wine libs/wpp tools include dlls programs: __builddeps__
programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include loader server: libs/port libs/wine tools
fonts: tools
include: tools/widl
programs: dlls
libs/wine $(ALL_TOOL_DIRS): libs/port
tools/wmc tools/wrc: tools
tools tools/wmc tools/wrc: libs/wine
tools/widl tools/wmc tools/wrc: libs/wpp
dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: __builddeps__
programs/__install__ programs/__install-lib__: __builddeps__
fonts/__install__ fonts/__install-lib__: tools fonts/__install__ fonts/__install-lib__: tools
include/__install__ include/__install-dev__: include include/__install__ include/__install-dev__: include
libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine
@ -98,6 +107,12 @@ server/__install__ server/__install-lib__: libs/port libs/wine tools
programs/__install__: dlls/__install__ programs/__install__: dlls/__install__
programs/__install-lib__: dlls/__install-lib__ programs/__install-lib__: dlls/__install-lib__
tools/__install__ tools/__install-lib__ tools/__install-dev__: tools tools/__install__ tools/__install-lib__ tools/__install-dev__: tools
tools/widl/__install__ tools/widl/__install-dev__: tools/widl
tools/winebuild/__install__ tools/winebuild/__install-dev__: tools/winebuild
tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump
tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc
tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc
tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc
RECURSE_TARGETS = \ RECURSE_TARGETS = \
$(SUBDIRS) \ $(SUBDIRS) \
@ -119,7 +134,7 @@ $(MAKEDEP): include/config.h
# Test rules # Test rules
$(TESTSUBDIRS:%=%/__test__): wine $(TESTSUBDIRS:%=%/__test__): wine
$(TESTSUBDIRS:%=%/__crosstest__): tools include $(TESTSUBDIRS:%=%/__crosstest__): __builddeps__
# Misc rules # Misc rules

23
configure vendored
View File

@ -605,6 +605,7 @@ ALL_IMPORTLIB_RULES
ALL_IMPORT_LIBS ALL_IMPORT_LIBS
ALL_STATIC_LIBS ALL_STATIC_LIBS
ALL_IMPLIB_DIRS ALL_IMPLIB_DIRS
ALL_TOOL_DIRS
ALL_DLL_DIRS ALL_DLL_DIRS
ALL_TOP_DIRS ALL_TOP_DIRS
ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS
@ -13663,6 +13664,8 @@ ALL_TOP_DIRS=""
ALL_DLL_DIRS="" ALL_DLL_DIRS=""
ALL_TOOL_DIRS=""
ALL_IMPLIB_DIRS="" ALL_IMPLIB_DIRS=""
ALL_STATIC_LIBS="" ALL_STATIC_LIBS=""
@ -18859,7 +18862,7 @@ ac_config_files="$ac_config_files server/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/Makefile" tools/Makefile"
test "x$enable_tools" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools" tools"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/Makefile: tools/Makefile.in Make.rules config.status" tools/Makefile: tools/Makefile.in Make.rules config.status"
@ -18867,42 +18870,48 @@ ac_config_files="$ac_config_files tools/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/widl/Makefile" tools/widl/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/widl"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status" tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/widl/Makefile" ac_config_files="$ac_config_files tools/widl/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/winebuild/Makefile" tools/winebuild/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/winebuild"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status" tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/winebuild/Makefile" ac_config_files="$ac_config_files tools/winebuild/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/winedump/Makefile" tools/winedump/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/winedump"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status" tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/winedump/Makefile" ac_config_files="$ac_config_files tools/winedump/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/winegcc/Makefile" tools/winegcc/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/winegcc"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status" tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/winegcc/Makefile" ac_config_files="$ac_config_files tools/winegcc/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/wmc/Makefile" tools/wmc/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/wmc"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status" tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/wmc/Makefile" ac_config_files="$ac_config_files tools/wmc/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
tools/wrc/Makefile" tools/wrc/Makefile"
test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
tools/wrc"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status" tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status"
ac_config_files="$ac_config_files tools/wrc/Makefile" ac_config_files="$ac_config_files tools/wrc/Makefile"

15
configure.ac
View File

@ -2101,6 +2101,7 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
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_IMPLIB_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"") AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"") AC_SUBST(ALL_IMPORT_LIBS,"")
@ -2666,13 +2667,13 @@ WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
dnl Build dependencies for test files compiled into winetest dnl Build dependencies for test files compiled into winetest

14
tools/Makefile.in
View File

@ -30,16 +30,6 @@ C_SRCS = \
relpath.c \ relpath.c \
sfnt2fnt.c sfnt2fnt.c
INSTALLSUBDIRS = \
widl \
winebuild \
winedump \
winegcc \
wmc \
wrc
SUBDIRS = $(INSTALLSUBDIRS)
EXTRASUBDIRS = winapi EXTRASUBDIRS = winapi
INSTALLDIRS = \ INSTALLDIRS = \
@ -50,7 +40,7 @@ INSTALLDIRS = \
UPDATE_DESKTOP_DATABASE = update-desktop-database UPDATE_DESKTOP_DATABASE = update-desktop-database
all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) all: $(PROGRAMS) $(MANPAGES)
@MAKE_RULES@ @MAKE_RULES@
@ -94,8 +84,6 @@ uninstall::
$(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop
-$(UPDATE_DESKTOP_DATABASE) -$(UPDATE_DESKTOP_DATABASE)
wmc wrc: relpath$(EXEEXT)
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend
Makefile: makedep$(EXEEXT) Makefile: makedep$(EXEEXT)

4
tools/make_makefiles
View File

@ -389,6 +389,10 @@ sub update_makefiles(@)
(my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
push @lines, "WINE_CONFIG_LIB($name)\n"; push @lines, "WINE_CONFIG_LIB($name)\n";
} }
elsif ($file =~ /^tools.*\/Makefile$/)
{
push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOOL_DIRS],[enable_tools])\n";
}
elsif ($file =~ /^[^\/]*\/Makefile$/) elsif ($file =~ /^[^\/]*\/Makefile$/)
{ {
push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOP_DIRS])\n"; push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOP_DIRS])\n";