Module: wine Branch: master Commit: bb26242f4e88f9817571e0990eb679a0c80ebb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb26242f4e88f9817571e0990e...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Feb 8 20:43:03 2010 +0100
makefiles: Build the libs subdirectories directly from the top-level makefile.
---
Makefile.in | 40 ++++++++++++++++++++++++---------------- configure | 9 --------- configure.ac | 1 - libs/Makefile.in | 21 --------------------- 4 files changed, 24 insertions(+), 47 deletions(-)
diff --git a/Makefile.in b/Makefile.in index 08349b3..7282cd1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,18 +33,23 @@ SUBDIRS = \ documentation \ fonts \ include \ - libs \ + libs/port \ + libs/wine \ + libs/wpp \ loader \ programs \ server \ tools
# Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = @ALL_TOP_DIRS@ +INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@
# Sub-directories to run make test into TESTSUBDIRS = dlls
+# Sub-directories that don't have a makefile +EXTRASUBDIRS = libs + all: wine @echo "Wine build complete."
@@ -75,20 +80,23 @@ uninstall:: # Dependencies between directories
all: $(INSTALLSUBDIRS) -dlls: include libs tools -fonts loader server: libs tools -programs: dlls include libs tools -include: libs tools -tools: libs - -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__: libs tools include dlls/__install__ -programs/__install-lib__: libs tools include dlls/__install-lib__ + +dlls programs: libs/port libs/wine libs/wpp tools include +loader server: libs/port libs/wine tools +fonts include: tools +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 +programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include +fonts/__install__ fonts/__install-lib__: tools +include/__install__ include/__install-dev__: include +libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine +loader/__install__ loader/__install-lib__: libs/port libs/wine tools +server/__install__ server/__install-lib__: libs/port libs/wine tools +programs/__install__: dlls/__install__ +programs/__install-lib__: dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools
RECURSE_TARGETS = \ diff --git a/configure b/configure index dba6223..4bb5081 100755 --- a/configure +++ b/configure @@ -18319,14 +18319,6 @@ include/Makefile: include/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files include/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ - libs/Makefile" -test "x$enable_libs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \ - libs" -ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -libs/Makefile: libs/Makefile.in Make.rules config.status" -ac_config_files="$ac_config_files libs/Makefile" - -ALL_MAKEFILES="$ALL_MAKEFILES \ libs/port/Makefile"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS @@ -20119,7 +20111,6 @@ do "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; "libs/port/Makefile") CONFIG_FILES="$CONFIG_FILES libs/port/Makefile" ;; "libs/wine/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;; "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; diff --git a/configure.ac b/configure.ac index 24aac13..63b3cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2606,7 +2606,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([libs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([libs/port/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) diff --git a/libs/Makefile.in b/libs/Makefile.in deleted file mode 100644 index ad6a2fc..0000000 --- a/libs/Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = none - -SUBDIRS = \ - port \ - wine \ - wpp - -INSTALLSUBDIRS = \ - wine - -@MAKE_RULES@ - -all: $(SUBDIRS) - -# Directory dependencies - -wine wine/__install__ wine/__install-lib__: port