[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile main.c

[Jeff Cohen]

Changes in directory llvm-test/MultiSource/Benchmarks/McCat/18-imp:

Makefile updated: 1.4 -> 1.5
main.c updated: 1.1 -> 1.2
---
Log message:

Fix for src != obj.

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

 Makefile |    2 +-
 main.c   |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.4 llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.4	Wed Sep  1 09:33:25 2004
+++ llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile	Thu Mar 29 19:34:14 2007
@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 PROG = imp
-RUN_OPTIONS += sg01.imp
+RUN_OPTIONS += $(PROJ_SRC_DIR)/sg01.imp
 LDFLAGS := -lm
 
 include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/McCat/18-imp/main.c
diff -u llvm-test/MultiSource/Benchmarks/McCat/18-imp/main.c:1.1 llvm-test/MultiSource/Benchmarks/McCat/18-imp/main.c:1.2
--- llvm-test/MultiSource/Benchmarks/McCat/18-imp/main.c:1.1	Mon May 12 13:06:07 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/18-imp/main.c	Thu Mar 29 19:34:14 2007
@@ -46,7 +46,7 @@
   void *var;
 } ParmT;
 
-char IMAGE[80];
+char IMAGE[800];
 double SIGMA;
 int VAR_THRESHOLD = -1;
 double VSPREAD_THRESHOLD = 0.02;
@@ -117,6 +117,10 @@
   char read_parm[25];
   char read_val[80];
 
+  /* Hack: put image file in same directory as input file */
+  strcpy(IMAGE, file);
+  parms[0].var = strrchr(IMAGE, '/') + 1;
+
   if ((fp = fopen(file, "r")) == NULL)
     {
       printf("%s not found. Exiting.\n", file);