[llvm-commits] CVS: llvm-tv/tools/llvm-tv/Makefile

[Misha Brukman]

Changes in directory llvm-tv/tools/llvm-tv:

Makefile updated: 1.17 -> 1.18
---
Log message:

Assume wx-config is in the PATH instead of in the source/build tree


---
Diffs of the changes:  (+7 -6)

Index: llvm-tv/tools/llvm-tv/Makefile
diff -u llvm-tv/tools/llvm-tv/Makefile:1.17 llvm-tv/tools/llvm-tv/Makefile:1.18
--- llvm-tv/tools/llvm-tv/Makefile:1.17	Thu Jul 15 16:27:08 2004
+++ llvm-tv/tools/llvm-tv/Makefile	Tue Oct  5 16:37:20 2004
@@ -6,8 +6,10 @@
 # note: delete when FileUtils is assimilated into libsupport
 USEDLIBS = snapshot
 
-CPPFLAGS = $(shell $(LEVEL)/lib/wxwindows/wx-config --cflags)
-TOOLLINKOPTSB = $(shell $(LEVEL)/lib/wxwindows/wx-config --libs)
+CPPFLAGS = $(shell wx-config --cflags)
+TOOLLINKOPTSB = $(shell wx-config --libs)
+WXDIR = $(shell wx-config --prefix)
+WXLIB = $(WXDIR)/lib
 
 ifdef NOHTML
 CPPFLAGS += -DNOHTML
@@ -19,12 +21,11 @@
        $(DESTTOOLCURRENT)/opt-snap
 
 $(DESTTOOLCURRENT)/llvm-tv.exe: Makefile
-	echo exec env LD_LIBRARY_PATH=$(shell cd $(LEVEL)/lib/wxwindows/lib; pwd):\$$LD_LIBRARY_PATH \
-		llvm-tv  > $@
+	echo exec env LD_LIBRARY_PATH=$(WXLIB):\$$LD_LIBRARY_PATH llvm-tv > $@
 	chmod u+x $@
 
 $(DESTTOOLCURRENT)/opt-snap: Makefile
-	echo exec env LD_LIBRARY_PATH=$(shell cd $(LEVEL)/lib/wxwindows/lib; pwd):\$$LD_LIBRARY_PATH \
+	echo exec env LD_LIBRARY_PATH=$(WXLIB):\$$LD_LIBRARY_PATH \
 		OPTPASSES=\"$$\*\" opt -load=$(DESTLIBCURRENT)/libsnapshot.so $$\* > $@
 	chmod u+x $@
 
@@ -34,7 +35,7 @@
 endif
 
 mac-app:
-	@./MakeMacOSBundle llvm-tv "$(LEVEL)/lib/wxwindows" "$(DESTTOOLCURRENT)/llvm-tv"
+	@./MakeMacOSBundle llvm-tv "$(WXDIR)" "$(DESTTOOLCURRENT)/llvm-tv"
 
 clean-mac-app:
 	rm -rf llvm-tv.app