From 9188bd647bf979d0ec90436e1b270e21bf756324 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 21 Aug 2010 17:19:48 +0200
Subject: [PATCH] winetest: Include the build info also in the standard build.

---
 .gitignore                    |  1 +
 programs/winetest/Makefile.in | 17 ++++++++++-------
 programs/winetest/dist.rc     | 22 ----------------------
 tools/make_makefiles          |  1 +
 4 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 programs/winetest/dist.rc

diff --git a/.gitignore b/.gitignore
index 4e0346ffa98..16a436b8c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,6 +258,7 @@ programs/winedbg/debug.yy.c
 programs/winedbg/winedbg.man
 programs/winetest/*_test.exe
 programs/winetest/*_test.rc
+programs/winetest/build.nfo
 programs/winetest/build.rc
 programs/winhlp32/macro.lex.yy.c
 programs/wscript/ihost.h
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index ab11876cf01..11f720d7190 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -24,13 +24,16 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res)
 
 @MAKE_PROG_RULES@
 
-@ALL_WINETEST_DEPENDS@
-
 clean::
-	$(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS)
+	$(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS)
 
 build.rc: dummy
-	build="STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
+	build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
+
+build.nfo:
+	-$(CC) -v 2>$@
+
+build.res: build.nfo
 
 # Rules for building distributable executable
 
@@ -38,8 +41,8 @@ build.rc: dummy
 
 dist: winetest-dist.exe$(DLLEXT)
 
-winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
-	$(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT)
+	cp winetest.exe$(DLLEXT) $@
 	-upx -9 -qqq $@
 
-dist.res: build.nfo
+@ALL_WINETEST_DEPENDS@
diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc
deleted file mode 100644
index 6e3ac6c3c1a..00000000000
--- a/programs/winetest/dist.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Resources for the binary we distribute to testers
- *
- * Copyright 2004 Ferenc Wagner
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* @makedep: build.nfo */
-BUILD_INFO STRINGRES "build.nfo"
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 83d7836dc90..bc52c49a82c 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -96,6 +96,7 @@ my @ignores = (
     "include/stamp-h",
     "programs/winetest/*_test.exe",
     "programs/winetest/*_test.rc",
+    "programs/winetest/build.nfo",
     "programs/winetest/build.rc",
     "tools/makedep",
 );