Changed the main Makefile for it to use the jpeg-7a folder
authorviric@mandarina
Sun, 26 Nov 2006 16:47:40 +0100
changeset 72 d1c2ccfff97f
parent 71 889a395c6f1a
child 73 2b5c70dbfc9b
Changed the main Makefile for it to use the jpeg-7a folder
src/Makefile
--- a/src/Makefile	Fri Oct 13 11:22:22 2006 +0200
+++ b/src/Makefile	Sun Nov 26 16:47:40 2006 +0100
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-g -ansi -pedantic -Wall -Ijpeg-6b
+CFLAGS=-g -ansi -pedantic -Wall -Ijpeg-7a
 
 LDFLAGS_GSL=-lnetpbm -lgsl -lm -lgslcblas
 LDFLAGS_NETPBM=-lnetpbm
@@ -50,19 +50,19 @@
 mat2pgm: mat2pgm.o libmat.o
 	$(CC) $(LDFLAGS_NETPBM) $(LDFLAGS_GSL) -o $@ $< libmat.o
 
-imgerror: imgerror.o libjpegrest.a jpeg-6b/libjpeg.a
+imgerror: imgerror.o libjpegrest.a jpeg-7a/libjpeg.a
 	$(CC) $(LDFLAGS_NETPBM) $(LDFLAGS_GSL) \
-		-o $@ $< libjpegrest.a jpeg-6b/libjpeg.a
-test_openjpeg: test_openjpeg.o libjpegrest.a jpeg-6b/libjpeg.a
+		-o $@ $< libjpegrest.a jpeg-7a/libjpeg.a
+test_openjpeg: test_openjpeg.o libjpegrest.a jpeg-7a/libjpeg.a
 	$(CC) $(LDFLAGS_NETPBM) $(LDFLAGS_GSL) \
-		-o $@ $< libjpegrest.a jpeg-6b/libjpeg.a
+		-o $@ $< libjpegrest.a jpeg-7a/libjpeg.a
 
-jpegdescribe: jpegdescribe.o jpeg-6b/libjpeg.a
-	$(CC) -o $@ $< jpeg-6b/libjpeg.a
+jpegdescribe: jpegdescribe.o jpeg-7a/libjpeg.a
+	$(CC) -o $@ $< jpeg-7a/libjpeg.a
 
-jpeg-6b/libjpeg.a:
-	cd jpeg-6b && CFLAGS="$(CFLAGS)" ./configure
-	cd jpeg-6b && $(MAKE) libjpeg.a
+jpeg-7a/libjpeg.a:
+	cd jpeg-7a && CFLAGS="$(CFLAGS)" ./configure
+	cd jpeg-7a && $(MAKE) libjpeg.a
 
 clean:
 	rm -f *.o $(LIBRARIES) $(PROGRAMS)