Move all files from winapi_check/ to winapi/, and remove references to

Make.rules.in

@@ -58,7 +58,7 @@ ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLA
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
-WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
+WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
 WINEWRAPPER  = $(TOPSRCDIR)/tools/winewrapper
 C2MAN        = $(TOPSRCDIR)/tools/c2man.pl
 RUNTEST      = $(TOPSRCDIR)/tools/runtest

tools/Makefile.in

@@ -34,8 +34,6 @@ SUBDIRS = \
 
 INSTALLSUBDIRS = $(SUBDIRS)
 
-EXTRASUBDIRS = winapi_check
-
 UPDATE_DESKTOP_DATABASE = update-desktop-database
 
 all: $(PROGRAMS) $(SUBDIRS)

tools/winapi/setup.pm

@@ -77,7 +77,7 @@ BEGIN {
 	$winapi_dir = "$wine_dir/tools/winapi";
 	$winapi_dir =~ s%^\./%%;
 
-	$winapi_check_dir = "$wine_dir/tools/winapi_check";
+	$winapi_check_dir = "$wine_dir/tools/winapi";
 	$winapi_check_dir =~ s%^\./%%;
 
 	push @INC, ($winapi_dir, $winapi_check_dir);