[llvm-commits] CVS: llvm/test/Programs/External/Povray/Makefile

[John Criswell]

Changes in directory llvm/test/Programs/External/Povray:

Makefile updated: 1.1 -> 1.2

---
Log message:

Get Povray to link against our versions of zlib and libpng instead of the
system versions.  Being a very smart program, Povray prints error messages
if it grabs the header file of one version of libpng and then links against
another.

Also modified the run options so that the generated image is sent to stdout.



---
Diffs of the changes:  (+3 -3)

Index: llvm/test/Programs/External/Povray/Makefile
diff -u llvm/test/Programs/External/Povray/Makefile:1.1 llvm/test/Programs/External/Povray/Makefile:1.2
--- llvm/test/Programs/External/Povray/Makefile:1.1	Fri Feb 20 12:36:30 2004
+++ llvm/test/Programs/External/Povray/Makefile	Fri Feb 20 15:20:40 2004
@@ -4,10 +4,10 @@
 
 PROG = povray
 CPPFLAGS += -I$(BUILD_SRC_ROOT)/runtime/libpng -DPREFIX=\"$(BUILD_OBJ_DIR)\" -DSYSCONFDIR=\"$(POVRAY_ROOT)\" -DPOV_LIB_DIR=\"$(BUILD_OBJ_DIR)/lib\" -IOutput/src -UHAVE_LIBVGA
-LIBS += -lz -lpng -ltiff -ljpeg -lX11 -lstdc++
-LDFLAGS += -L/usr/X11R6/lib -lz -lpng -ltiff -ljpeg -lX11 -lstdc++
+LIBS += -lz -lpng -lstdc++ -ltiff
+LDFLAGS += -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) -lz -lpng -lstdc++ -ltiff
 
 SourceDir = $(POVRAY_ROOT)/src
 
-RUN_OPTIONS = -I$(POVRAY_ROOT)/scenes/advanced/chess2.pov -L$(POVRAY_ROOT)/include
+RUN_OPTIONS = -I$(POVRAY_ROOT)/scenes/advanced/chess2.pov -L$(POVRAY_ROOT)/include -O-
 include ../../MultiSource/Makefile.multisrc