--- fotoxx-9.7/Makefile.orig	2010-03-10 06:28:55.000000000 +0100
+++ fotoxx-9.7/Makefile	2010-03-15 09:04:09.000000000 +0100
@@ -5,8 +5,10 @@
 SOURCE = $(PROGRAM)-$(VERSION).cpp
 
 # replace CFLAGS and LFLAGS -O3 with -g for GDB debugging
-CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
-LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0 gthread-2.0`
+CFLAGS := $(OPTCFLAGS) -Wall $(shell pkg-config --cflags gtk+-2.0)
+LDFLAGS := $(OPTLDFLAGS) -rdynamic
+LIBS := $(OPTLIBS) $(shell pkg-config --libs gtk+-2.0 gthread-2.0) -lfreeimage
+CXX = g++
 
 # use $PREFIX if defined, else assume /usr/local
 ifeq "$(PREFIX)" ""
@@ -22,15 +24,15 @@
 
 $(PROGRAM): $(PROGRAM).o zfuncs.o
 	@ ./dependencies.sh
-	@ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o                  # dynamic link
+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 #	@ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o /usr/lib/libfreeimage.a      # static link
 
 $(PROGRAM).o: $(SOURCE)
-	@ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
+	$(CXX) $(CFLAGS) -c -o $@ $^ \
 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
 
 zfuncs.o: zfuncs.cpp
-	@ g++ $(CFLAGS) zfuncs.cpp	\
+	$(CXX) $(CFLAGS) -c -o $@ $^ \
 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
 
 install: $(PROGRAM)