From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 20 Aug 2007 10:21:31 +0000 (+0200)
Subject: src/Makefile: Updated..
X-Git-Url: https://git.octo.it/?p=libopano.git;a=commitdiff_plain

src/Makefile: Updated..
---

diff --git a/src/Makefile b/src/Makefile
index df86dea..bb6dc2a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,23 +1,26 @@
-PTVIEWER_SOURCES = viewer.c jpeg.c panolib.c
+PTVIEWER_SOURCES = viewer.c jpeg.c panolib.c utils_math.c utils_imgage.c
 
 X11_INC_DIR=-I/usr/X11R6/include
 X11_LIB_DIR=-L/usr/X11R6/lib
 X11_LIB_NAME=-lX11
 
 
-CC=cc
+CC = gcc-4.2
+CFLAGS = -Wall -Werror -O0 -g
+#CFLAGS = -Wall -Werror -O0 -g `Wand-config --cflags`
+LDFLAGS = `Wand-config --ldflags`
 
 
 # define BIGENDIAN=1 for Linuxppc
 # CFLAGS= -DBIGENDIAN=1
 
-OBJS = viewer.o jpeg.o panolib.o
+OBJS = viewer.o jpeg.o panolib.o utils_math.o utils_image.c
 
 
-LIBS=$(X11_LIB_DIR) $(X11_LIB_NAME) -ljpeg -lm
+LIBS=$(X11_LIB_DIR) $(X11_LIB_NAME) -ljpeg -lm `Wand-config --libs`
 
 .c.o: $(PTVIEWER_SOURCES)
 	$(CC) -O -c $(CFLAGS) $*.c
 
 PTViewer: $(OBJS) 
-	$(CC) -o PTViewer $(CFLAGS) $(OBJS)  $(LIBS)
+	$(CC) -o PTViewer $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS)