From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 20 Nov 2014 15:08:56 +0000 (+0000)
Subject: This change was triggered by BZ #247974 which suggested to include
X-Git-Tag: svn/VALGRIND_3_11_0^2~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=721ac5231f6bda17f592ebdc8efdfeff36f4ef86;p=thirdparty%2Fvalgrind.git

This change was triggered by BZ #247974 which suggested to include
VEX/test_main.* in the tarball. We don't want to do that because those
files are really just scaffolding for developers to play with and not
meant for general consumption (and are also bitrotting ATM). Therefore,
this patch moves them to the "useful" subdirectory and adds a crude
Makefile there to build the executable.
Makefile-gcc updated accordingly.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2998
---

diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index 12bf1ed165..c29d1520a1 100644
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -131,8 +131,7 @@ install:
 
 scratch: clean all
 
-vex: libvex.a test_main.o
-	$(CC) $(CCFLAGS) -o vex test_main.o libvex.a
+vex: libvex.a
 
 libvex.a: $(LIB_OBJS)
 	rm -f libvex.a
@@ -206,15 +205,14 @@ TAG-arm64-linux:
 
 
 clean:
-	rm -f $(LIB_OBJS) *.a vex test_main.o TAG-* \
+	rm -f $(LIB_OBJS) *.a TAG-* \
 		pub/libvex_guest_offsets.h \
 		auxprogs/genoffsets.s
 
 minidist:
 	rm -f vex--minidist-2005MMDD.tar
 	tar cf vex--minidist-2005MMDD.tar $(PUB_HEADERS) $(PRIV_HEADERS) \
-		test_main.c test_main.h				\
-		Makefile					\
+		Makefile-gcc					\
 		`echo $(LIB_OBJS) | sed "s/\.o/\.c/g"`
 	@echo 
 	@echo minidist done, size follows:
@@ -241,10 +239,6 @@ pub/libvex_guest_offsets.h:
 ALL_HEADERS  = $(PUB_HEADERS) $(PRIV_HEADERS)
 ALL_INCLUDES = $(PUB_INCLUDES) $(PRIV_INCLUDES)
 
-test_main.o: $(PUB_HEADERS) test_main.c test_main.h
-	$(CC) $(CCFLAGS) $(PUB_INCLUDES) -o test_main.o \
-					 -c test_main.c
-
 priv/ir_defs.o: $(ALL_HEADERS) priv/ir_defs.c
 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir_defs.o \
 					 -c priv/ir_defs.c
diff --git a/VEX/useful/Makefile-vex b/VEX/useful/Makefile-vex
new file mode 100644
index 0000000000..eb0b4616e3
--- /dev/null
+++ b/VEX/useful/Makefile-vex
@@ -0,0 +1,8 @@
+# Crude makefile to build the "vex" executable from test_main.c
+
+vex:
+	(cd ..; make -f Makefile-gcc)
+	cc -I../pub -o vex test_main.c ../libvex.a
+
+clean:
+	rm -f vex
diff --git a/VEX/test_main.c b/VEX/useful/test_main.c
similarity index 100%
rename from VEX/test_main.c
rename to VEX/useful/test_main.c
diff --git a/VEX/test_main.h b/VEX/useful/test_main.h
similarity index 100%
rename from VEX/test_main.h
rename to VEX/useful/test_main.h
diff --git a/VEX/test_main.h.base b/VEX/useful/test_main.h.base
similarity index 100%
rename from VEX/test_main.h.base
rename to VEX/useful/test_main.h.base