From: Julian Seward <jseward@acm.org>
Date: Thu, 15 Sep 2005 16:00:58 +0000 (+0000)
Subject: Makefile fixes:
X-Git-Tag: svn/VALGRIND_3_1_1^2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f446d55130e2be0b1bbb23171e8f6ca146c4acf0;p=thirdparty%2Fvalgrind.git

Makefile fixes:

- Fix default compiler better
- Add dummy install target to help V's build system
- Don't hardwire 'ar' (fix for #112199).



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

diff --git a/VEX/Makefile b/VEX/Makefile
index 5be717519f..4e664d777b 100644
--- a/VEX/Makefile
+++ b/VEX/Makefile
@@ -63,9 +63,13 @@ PUB_INCLUDES = -Ipub
 PRIV_INCLUDES = -Ipriv
 
 
-ifeq ($(CC),) 
+ifndef $(CC)
    CC = gcc 
 endif 
+ifndef $(AR)
+   AR = ar 
+endif
+
 CCFLAGS = -g -O -Wall -Wmissing-prototypes -Wshadow -Winline \
 		-Wpointer-arith -Wbad-function-cast -Wcast-qual \
 		-Wcast-align -Wmissing-declarations \
@@ -85,6 +89,9 @@ CCFLAGS = -g -O -Wall -Wmissing-prototypes -Wshadow -Winline \
 
 all: vex
 
+# Empty, needed for Valgrind
+install:
+
 scratch: clean version all
 
 vex: libvex.a test_main.o
@@ -92,7 +99,7 @@ vex: libvex.a test_main.o
 
 libvex.a: $(LIB_OBJS)
 	rm -f libvex.a
-	ar clq libvex.a $(LIB_OBJS)
+	$(AR) clq libvex.a $(LIB_OBJS)
 
 # This doesn't get rid of priv/main/vex_svnversion.h, because
 # that can't be regenerated in the final Valgrind tarball, and