From 6938b5d367a799ebe7447c1945852480a351343b Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@google.com>
Date: Fri, 26 Oct 2007 13:13:11 -0700
Subject: [PATCH] makefiles: add a notest target
---
 Makefile.in                |   14 +++++++++++++-
 dlls/Makefile.in           |    3 +++
 programs/Makefile.in       |    5 +++++
 programs/Makeprog.rules.in |    9 +++++++++
 4 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 96d395b..f6c43e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,14 +47,21 @@ INSTALLLIBSUBDIRS = \
 	loader \
 	programs \
 	server
+INSTALLLIBSUBDIRS_NOTEST = \
+	$(FONTSSUBDIRS) \
+	loader \
+	programs/__notest__ \
+	server
 
 # Sub-directories to install for install-dev
 INSTALLDEVSUBDIRS = include
 
 # Sub-directories to install for both install-lib and install-dev
 INSTALLBOTHSUBDIRS = dlls libs tools
+INSTALLBOTHSUBDIRS_NOTEST = dlls/__notest__ libs tools
 
 INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS)
+INSTALLSUBDIRS_NOTEST = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS_NOTEST)
 
 # Sub-directories to run make test into
 TESTSUBDIRS = dlls
@@ -94,9 +101,11 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__u
 # Dependencies between directories
 
 all: $(INSTALLSUBDIRS) $(INSTALLBOTHSUBDIRS)
-dlls: include libs tools
+notest: $(INSTALLSUBDIRS_NOTEST) $(INSTALLBOTHSUBDIRS_NOTEST)
+dlls dlls/__notest__: include libs tools
 fonts loader server: libs tools
 programs: dlls include libs tools
+programs/__notest__: dlls/__notest__ include libs tools
 include: libs tools
 tools: libs
 
@@ -129,6 +138,9 @@ # Test rules
 $(TESTSUBDIRS:%=%/__test__): wine
 $(TESTSUBDIRS:%=%/__crosstest__): tools include
 
+dlls/__notest__ programs/__notest__: dummy
+	@cd `dirname $@` && $(MAKE) notest
+
 # Misc rules
 
 TAGS etags:
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 39b6c7b..909ac70 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -326,6 +326,7 @@ SUBDIRS = \
 	winequartz.drv \
 	winex11.drv
 
+BUILDSUBDIRS_NOTEST   = $(BASEDIRS) $(EXTRADIRS)
 BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)
 INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS)
 DOCSUBDIRS     = $(BASEDIRS) $(EXTRADIRS)
@@ -389,6 +390,8 @@ # Main target
 
 all: $(BUILDSUBDIRS) @WIN16_FILES@
 
+notest: $(BUILDSUBDIRS_NOTEST) @WIN16_FILES@
+
 # Placeholders for 16-bit libraries
 
 avifile.dll16:
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 1a3d3d5..657da22 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -115,6 +115,11 @@ PROGRAMS = wineapploader winelauncher
 
 all: $(PROGRAMS) $(SUBDIRS)
 
+notest: $(PROGRAMS) $(SUBDIRS:%=%/__notest__)
+
+$(SUBDIRS:%=%/__notest__): dummy
+	@cd `dirname $@` && $(MAKE) notest
+
 wineapploader: wineapploader.in
 	sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
 
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index f73498e..31cde31 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -61,3 +61,12 @@ uninstall:: uninstall_prog$(DLLEXT)
 
 clean::
 	$(RM) $(BASEMODULE) $(MODULE)
+
+# Misc rules
+
+ifeq ($(MODULE), winetest.exe)
+notest: ;
+else
+notest: all
+endif
+
-- 
1.4.1