makefiles: Only run test and documentation targets in directories that need them.
diff --git a/Make.rules.in b/Make.rules.in
index 9d7e502..0f53804 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -225,18 +225,13 @@
$(SUBDIRS:%=%/__clean__): dummy
@cd `dirname $@` && $(MAKE) clean
-$(SUBDIRS:%=%/__testclean__): dummy
- @cd `dirname $@` && $(MAKE) testclean
-
$(EXTRASUBDIRS:%=%/__clean__): dummy
-cd `dirname $@` && $(RM) $(CLEAN_FILES)
-testclean:: $(SUBDIRS:%=%/__testclean__)
-
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(IDL_SRCS:.idl=.h) $(IDL_SRCS:.idl=_c.c) $(IDL_SRCS:.idl=_i.c) $(IDL_SRCS:.idl=_p.c) $(IDL_SRCS:.idl=_s.c) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES)
-.PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__)
+.PHONY: clean $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
# Rules for installing
@@ -265,13 +260,39 @@
# Rules for testing
-$(SUBDIRS:%=%/__test__): dummy
+$(TESTSUBDIRS:%=%/__test__): dummy
@cd `dirname $@` && $(MAKE) test
-$(SUBDIRS:%=%/__crosstest__): dummy
+$(TESTSUBDIRS:%=%/__crosstest__): dummy
@cd `dirname $@` && $(MAKE) crosstest
-.PHONY: check test crosstest $(SUBDIRS:%=%/__test__) $(SUBDIRS:%=%/__crosstest__)
+$(TESTSUBDIRS:%=%/__testclean__): dummy
+ @cd `dirname $@` && $(MAKE) testclean
+
+check test:: $(TESTSUBDIRS:%=%/__test__)
+
+crosstest:: $(TESTSUBDIRS:%=%/__crosstest__)
+
+testclean:: $(TESTSUBDIRS:%=%/__testclean__)
+
+.PHONY: check test testclean crosstest $(TESTSUBDIRS:%=%/__test__) $(TESTSUBDIRS:%=%/__crosstest__) $(TESTSUBDIRS:%=%/__testclean__)
+
+# Rules for auto documentation
+
+$(DOCSUBDIRS:%=%/__man__): dummy
+ @cd `dirname $@` && $(MAKE) man
+
+$(DOCSUBDIRS:%=%/__doc_html__): dummy
+ @cd `dirname $@` && $(MAKE) doc-html
+
+$(DOCSUBDIRS:%=%/__doc_sgml__): dummy
+ @cd `dirname $@` && $(MAKE) doc-sgml
+
+man: $(DOCSUBDIRS:%=%/__man__)
+doc-html: $(DOCSUBDIRS:%=%/__doc_html__)
+doc-sgml: $(DOCSUBDIRS:%=%/__doc_sgml__)
+
+.PHONY: man doc-html doc-sgml $(DOCSUBDIRS:%=%/__man__) $(DOCSUBDIRS:%=%/__doc_html__) $(DOCSUBDIRS:%=%/__doc_sgml__)
# Misc. rules
diff --git a/Makefile.in b/Makefile.in
index e013cfc..700cbad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,10 +107,7 @@
# Test rules
-check test:: $(TESTSUBDIRS:%=%/__test__)
$(TESTSUBDIRS:%=%/__test__): wine
-
-crosstest:: $(TESTSUBDIRS:%=%/__crosstest__)
$(TESTSUBDIRS:%=%/__crosstest__): tools include
# Misc rules
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 5927f33..b52490b 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -207,18 +207,73 @@
uuid \
winecrt0
+TESTSUBDIRS = \
+ advapi32/tests \
+ advpack/tests \
+ cabinet/tests \
+ comcat/tests \
+ comctl32/tests \
+ comdlg32/tests \
+ crypt32/tests \
+ d3d8/tests \
+ d3d9/tests \
+ ddraw/tests \
+ dinput/tests \
+ dnsapi/tests \
+ dsound/tests \
+ gdi/tests \
+ hlink/tests \
+ infosoft/tests \
+ iphlpapi/tests \
+ kernel/tests \
+ lz32/tests \
+ mapi32/tests \
+ mlang/tests \
+ msacm32/tests \
+ mscms/tests \
+ mshtml/tests \
+ msi/tests \
+ msvcrt/tests \
+ msvcrtd/tests \
+ msxml3/tests \
+ netapi32/tests \
+ ntdll/tests \
+ ole32/tests \
+ oleaut32/tests \
+ psapi/tests \
+ quartz/tests \
+ riched20/tests \
+ rpcrt4/tests \
+ rsabase/tests \
+ rsaenh/tests \
+ secur32/tests \
+ setupapi/tests \
+ shdocvw/tests \
+ shell32/tests \
+ shlwapi/tests \
+ urlmon/tests \
+ user/tests \
+ usp10/tests \
+ uxtheme/tests \
+ version/tests \
+ wininet/tests \
+ winmm/tests \
+ winspool.drv/tests \
+ ws2_32/tests
+
SUBDIRS = \
$(BASEDIRS) \
$(IMPLIBSUBDIRS) \
+ $(TESTSUBDIRS) \
glu32 \
glut32 \
opengl32 \
wined3d \
winex11.drv
-BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
-
-INSTALLSUBDIRS = $(BUILDSUBDIRS) $(IMPLIBSUBDIRS)
+BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)
+INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS)
+DOCSUBDIRS = $(BASEDIRS) $(EXTRADIRS)
@MAKE_RULES@
@@ -946,25 +1001,6 @@
uuid/libuuid.a: uuid
winecrt0/libwinecrt0.a: winecrt0
-# Rules for auto documentation
-
-$(SUBDIRS:%=%/__man__): dummy
- cd `dirname $@` && $(MAKE) man
-
-man: $(SUBDIRS:%=%/__man__)
-
-$(SUBDIRS:%=%/__doc_html__): dummy
- cd `dirname $@` && $(MAKE) doc-html
-
-doc-html: $(SUBDIRS:%=%/__doc_html__)
-
-$(SUBDIRS:%=%/__doc_sgml__): dummy
- cd `dirname $@` && $(MAKE) doc-sgml
-
-doc-sgml: $(SUBDIRS:%=%/__doc_sgml__)
-
-.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
-
# Misc rules
install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
@@ -977,8 +1013,4 @@
clean::
$(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES)
-check test:: $(BUILDSUBDIRS:%=%/__test__)
-
-crosstest:: $(BUILDSUBDIRS:%=%/__crosstest__)
-
### Dependencies:
diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in
index 2af10ab..19011c1 100644
--- a/dlls/Makeimplib.rules.in
+++ b/dlls/Makeimplib.rules.in
@@ -31,10 +31,4 @@
uninstall::
$(RM) $(DESTDIR)$(dlldir)/$(MODULE)
-# Misc. rules
-
-.PHONY: man doc-html doc-sgml
-
-man doc-html doc-sgml:
-
# End of global library rules
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 732ca0a..36e71a1 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -49,7 +49,7 @@
# Rules for testing
-check test:: $(TESTRESULTS) $(SUBDIRS:%=%/__test__)
+check test:: $(TESTRESULTS)
$(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 50e8942..7e5b029 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -22,8 +22,6 @@
security.c \
service.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in
index 5e73a76..f59efba 100644
--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@@ -12,8 +12,6 @@
install.c \
reg.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index e11ab70..bbdaff7 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -13,8 +13,6 @@
RC_SRCS = cabinet.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in
index e82913f..e5e242d 100644
--- a/dlls/comcat/Makefile.in
+++ b/dlls/comcat/Makefile.in
@@ -17,8 +17,6 @@
RC_SRCS = \
version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index b246759..42cb0a2 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -64,8 +64,6 @@
idi_tt_warn_sm.ico \
idt_check.bmp
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index d3f28f8..c6bb487 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -44,8 +44,6 @@
pd32_nocollate.ico \
pd32_portrait.ico
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index ad0a94a..3a47929 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -25,8 +25,6 @@
RC_SRCS = crypt32.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index e4bc35c..ebdb9db 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -27,8 +27,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 0d0f65d..f5a1745 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -29,8 +29,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 6bbeb1e..ff929b1 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -31,8 +31,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index daf0fe0..fca5054 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -22,8 +22,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in
index ddc14a5..256a692 100644
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@@ -15,8 +15,6 @@
query.c \
record.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 4bc3aa1..babd91b 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -21,8 +21,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index e8f0820..a9d2e0e 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -62,8 +62,6 @@
RC_SRCS = version.rc
RC_SRCS16 = version16.rc
-SUBDIRS = tests
-
EXTRASUBDIRS = \
enhmfdrv \
mfdrv
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index b6cbb78..d25f543 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -13,8 +13,6 @@
hlink_main.c \
link.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index 32b8d91..1651dbd 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -11,8 +11,6 @@
infosoft_main.c \
wordbreaker.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 163593f..54d60cc 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -12,8 +12,6 @@
iphlpapi_main.c \
ipstats.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index b64c23c..027babf 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -93,7 +93,7 @@
messages/winerr_enu.mc
EXTRA_OBJS = relay16asm.o
-SUBDIRS = tests
+
EXTRASUBDIRS = messages nls
@MAKE_DLL_RULES@
diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in
index acfb207..72a155a 100644
--- a/dlls/lz32/Makefile.in
+++ b/dlls/lz32/Makefile.in
@@ -10,8 +10,6 @@
C_SRCS16 = lzexpand16.c
SPEC_SRCS16 = lzexpand.spec
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 4046193..27828e7 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -56,6 +56,10 @@
{
rename "$file.new", "$file";
print "$file updated\n";
+ if (-x "./config.status" && $file =~ /(.*Makefile)\.in$/)
+ {
+ system "./config.status", $1;
+ }
}
}
@@ -63,17 +67,17 @@
if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); }
my @args = @ARGV;
-if (!@args) { @args = split /\s/, `find dlls -name Makefile.in -print`; }
+if (!@args) { @args = map { s/^(.*)\.in/$1/; $_; } split(/\s/,`find dlls -name Makefile.in -print`); }
foreach my $i (@args)
{
- if ($i =~ /dlls\/(.*)\/tests\/Makefile.in/)
+ if ($i =~ /dlls\/(.*)\/tests\/Makefile/)
{
$testdirs{$1} = "$1/tests";
next;
}
- open MAKE, $i or die "cannot open $i\n";
+ open MAKE, "$i.in" or die "cannot open $i.in\n";
my $module = undef;
my $dir = $i;
@@ -165,23 +169,21 @@
printf NEWMAKE " \\\n\t%s", $dir;
}
-printf NEWMAKE "\n\nIMPLIBSUBDIRS =";
-foreach my $dir (sort values %staticlib_dirs)
-{
- printf NEWMAKE " \\\n\t%s", $dir;
-}
+print NEWMAKE "\n\nIMPLIBSUBDIRS = \\\n\t";
+print NEWMAKE join " \\\n\t", sort values %staticlib_dirs;
-printf NEWMAKE "\n\nSUBDIRS = \\\n\t\$(BASEDIRS) \\\n\t\$(IMPLIBSUBDIRS)";
-foreach my $dir (sort keys %special_dlls)
-{
- printf NEWMAKE " \\\n\t%s", $dir;
-}
-printf NEWMAKE <<EOF;
+print NEWMAKE "\n\nTESTSUBDIRS = \\\n\t";
+print NEWMAKE join " \\\n\t", sort values %testdirs;
+
+print NEWMAKE "\n\nSUBDIRS = \\\n\t";
+print NEWMAKE join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)",
+ sort keys %special_dlls;
+print NEWMAKE <<EOF;
-BUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)
-
-INSTALLSUBDIRS = \$(BUILDSUBDIRS) \$(IMPLIBSUBDIRS)
+BUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)
+INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)
+DOCSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)
EOF
################################################################
@@ -331,25 +333,6 @@
print NEWMAKE <<EOF;
-# Rules for auto documentation
-
-\$(SUBDIRS:%=%/__man__): dummy
- cd `dirname \$@` && \$(MAKE) man
-
-man: \$(SUBDIRS:%=%/__man__)
-
-\$(SUBDIRS:%=%/__doc_html__): dummy
- cd `dirname \$@` && \$(MAKE) doc-html
-
-doc-html: \$(SUBDIRS:%=%/__doc_html__)
-
-\$(SUBDIRS:%=%/__doc_sgml__): dummy
- cd `dirname \$@` && \$(MAKE) doc-sgml
-
-doc-sgml: \$(SUBDIRS:%=%/__doc_sgml__)
-
-.PHONY: man doc-html doc-sgml \$(SUBDIRS:%=%/__man__) \$(SUBDIRS:%=%/__doc_html__) \$(SUBDIRS:%=%/__doc_sgml__)
-
# Misc rules
install-lib:: \$(INSTALLSUBDIRS:%=%/__install-lib__)
@@ -362,10 +345,6 @@
clean::
\$(RM) \$(IMPORT_SYMLINKS) \$(WIN16_FILES)
-check test:: \$(BUILDSUBDIRS:%=%/__test__)
-
-crosstest:: \$(BUILDSUBDIRS:%=%/__crosstest__)
-
### Dependencies:
EOF
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 1e6e17b..fc75f00 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -14,8 +14,6 @@
sendmail.c \
util.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index 1d4f319..8cddcb4 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -12,8 +12,6 @@
mlang.c \
regsvr.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index d937343..3102e38 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -22,8 +22,6 @@
RC_SRCS = msacm.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index 9bec1b2..efedbb0 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -17,8 +17,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 0efa862..68b9987 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -42,8 +42,6 @@
IDL_SRCS = nsiface.idl
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
rsrc.res: mshtml.inf blank.htm
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 6bc9d01..b122de4 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -55,8 +55,6 @@
EXTRA_SRCS = sql.y cond.y
EXTRA_OBJS = sql.tab.o cond.tab.o
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
sql.tab.c sql.tab.h: sql.y
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 3f4b53d..77a9452 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -38,8 +38,6 @@
RC_SRCS = \
rsrc.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index 62ce8bc..d30ddc4 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -11,8 +11,6 @@
C_SRCS = \
debug.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 99628c3..acfe739 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -22,8 +22,6 @@
regsvr.c \
text.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 43c7585..2eb44da 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -21,8 +21,6 @@
share.c \
wksta.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 646808f..97c3a90 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -54,8 +54,6 @@
EXTRA_OBJS = relay32.o
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
relay32.o: $(WINEBUILD)
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 0a44570..2a6b39d 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -71,8 +71,6 @@
IDL_SRCS = \
dcom.idl
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index b1be07b..75548aa 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -39,8 +39,6 @@
RC_SRCS = oleaut32.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 732a2c3..4e618b4 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -9,8 +9,6 @@
C_SRCS = \
psapi_main.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 8873a95..100a66a 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -33,8 +33,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in
index 2688cf4..f358a41 100644
--- a/dlls/riched20/Makefile.in
+++ b/dlls/riched20/Makefile.in
@@ -26,8 +26,6 @@
wrap.c \
writer.c
-SUBDIRS = tests
-
RC_SRCS = version.rc
@MAKE_DLL_RULES@
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index ab88a0a..bf6efec 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -26,8 +26,6 @@
rpcrt4_main.c \
rpcss_np_client.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in
index a49185e..652f344 100644
--- a/dlls/rsabase/Makefile.in
+++ b/dlls/rsabase/Makefile.in
@@ -6,8 +6,6 @@
MODULE = rsabase.dll
IMPORTS = rsaenh kernel32
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 0db42e5..8a56a53 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -18,8 +18,6 @@
rsa.c \
rsaenh.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in
index ae32954..3367165 100644
--- a/dlls/secur32/Makefile.in
+++ b/dlls/secur32/Makefile.in
@@ -18,8 +18,6 @@
util.c \
wrapper.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index c77f40c..ad74c26 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -33,8 +33,6 @@
RC_SRCS= setupapi.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index 868c405..8b4d9ee 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -30,8 +30,6 @@
RC_SRCS = shdocvw.rc
IDL_TLB_SRCS = shdocvw_v1.tlb
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 54b2936..ccc6643 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -78,8 +78,6 @@
RC_SRCS16 = version16.rc
SPEC_SRCS16 = shell.spec
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
# Special rules for 16-bit resource files
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index da4d5c7..6680ada 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -28,8 +28,6 @@
RC_SRCS = \
shlwapi.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 0546bdb..7a398a6 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -23,8 +23,6 @@
RC_SRCS = rsrc.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
rsrc.res: urlmon.inf
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 773a333..77368b5 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -144,8 +144,6 @@
resources/mouse.rc \
resources/version16.rc
-SUBDIRS = tests
-
EXTRASUBDIRS = resources
@MAKE_DLL_RULES@
diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in
index a232524..896d1f5 100644
--- a/dlls/usp10/Makefile.in
+++ b/dlls/usp10/Makefile.in
@@ -9,8 +9,6 @@
C_SRCS = \
usp10.c
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index b73ef9a..7c68b40 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -19,8 +19,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index d56335e..c8cfcb9 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -16,8 +16,6 @@
SPEC_SRCS16 = ver.spec
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index af82426..5e68323 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -25,8 +25,6 @@
rsrc.rc \
version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 2492e32..e26f22d 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -28,8 +28,6 @@
RC_SRCS = winmm_res.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 4ab36b4..5243ae7 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -13,8 +13,6 @@
RC_SRCS = winspool.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
$(IMPORTLIB): $(MAINSPEC)
diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in
index d3b58b6..1853e99 100644
--- a/dlls/ws2_32/Makefile.in
+++ b/dlls/ws2_32/Makefile.in
@@ -20,8 +20,6 @@
RC_SRCS = version.rc
-SUBDIRS = tests
-
@MAKE_DLL_RULES@
### Dependencies:
