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

[Chris Lattner]

Changes in directory llvm-test/External/Povray:

Makefile updated: 1.14 -> 1.15
---
Log message:

The povray source distro we use has libpng in the source tree.  Use this
source instead of depending on having an installed libpng.  This gets the
program working on systems without libpng (like persephone).


---
Diffs of the changes:  (+16 -4)

 Makefile |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)


Index: llvm-test/External/Povray/Makefile
diff -u llvm-test/External/Povray/Makefile:1.14 llvm-test/External/Povray/Makefile:1.15
--- llvm-test/External/Povray/Makefile:1.14	Sat Jan 15 21:16:09 2005
+++ llvm-test/External/Povray/Makefile	Wed Jul 13 13:29:31 2005
@@ -4,11 +4,23 @@
 
 PROG = povray
 
-SourceDir = $(POVRAY_ROOT)/source
+## Copy all of the povray sources into the local directory.
+POVRAYSources := $(wildcard $(POVRAY_ROOT)/source/*.c)
+RAWLIBPNGSources := $(wildcard $(POVRAY_ROOT)/source/libpng/*.c)
+NONLIBPNGSources := $(addprefix $(POVRAY_ROOT)/source/libpng/, ansi2knr.c pngtest.c example.c)
+LIBPNGSources := $(filter-out $(NONLIBPNGSources), $(RAWLIBPNGSources))
 
-CPPFLAGS += -I$(POVRAY_ROOT)/source/unix -I$(PROJ_SRC_ROOT)/runtime/libpng -DPREFIX=\"$(PROJ_OBJ_DIR)\" -DSYSCONFDIR=\"$(POVRAY_ROOT)\" -DPOV_LIB_DIR=\"$(PROJ_OBJ_DIR)/lib\" -IOutput/src -UHAVE_LIBVGA
-LIBS +=    -lpng -lz -lm
-LDFLAGS += -lpng -lz -lm
+Source := $(notdir $(POVRAYSources)) $(notdir $(LIBPNGSources))
+
+CPPFLAGS += -I$(POVRAY_ROOT)/source/unix -I$(PROJ_SRC_ROOT)/runtime/libpng -DPREFIX=\"$(PROJ_OBJ_DIR)\" -DSYSCONFDIR=\"$(POVRAY_ROOT)\" -DPOV_LIB_DIR=\"$(PROJ_OBJ_DIR)/lib\" -IOutput/src -UHAVE_LIBVGA -I$(POVRAY_ROOT)/source/libpng -I$(POVRAY_ROOT)/source
+LIBS +=    -lz -lm
+LDFLAGS += -lz -lm
 
 RUN_OPTIONS = -I$(POVRAY_ROOT)/scenes/advanced/chess2.pov -L$(POVRAY_ROOT)/include -GA$<.junk -O-
 include $(LEVEL)/MultiSource/Makefile.multisrc
+
+$(notdir $(POVRAYSources)) : % : $(POVRAY_ROOT)/source/%
+	cp $< $@
+$(notdir $(LIBPNGSources)) : % : $(POVRAY_ROOT)/source/libpng/%
+	cp $< $@
+