--- gpscorrelate-1.5.6.orig/Makefile
+++ gpscorrelate-1.5.6/Makefile
@@ -4,22 +4,23 @@
 
 COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
 GOBJS    = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
-CFLAGS   = -Wall `pkg-config --cflags libxml-2.0 gtk+-2.0` -I/usr/include/exiv2
-OFLAGS   = -Wall `pkg-config --libs libxml-2.0 gtk+-2.0` -lm -lexiv2
+PKG_CFLAGS   = -Wall `pkg-config --cflags libxml-2.0 gtk+-2.0` -I/usr/include/exiv2
+PKG_OFLAGS   = -Wall `pkg-config --libs libxml-2.0` -lm -lexiv2
+PKG_OFLAGS_GUI   = -Wall `pkg-config --libs libxml-2.0 gtk+-2.0` -lm -lexiv2
 
 all:	gpscorrelate gpscorrelate-gui
 
 gpscorrelate: $(COBJS)
-	gcc $(OFLAGS) -o $@ $(COBJS)
+	gcc $(PKG_OFLAGS) ${CFLAGS} -o $@ $(COBJS)
 
 gpscorrelate-gui: $(GOBJS)
-	gcc $(OFLAGS) -o $@ $(GOBJS)
+	gcc $(PKG_OFLAGS_GUI) ${CFLAGS} -o $@ $(GOBJS)
 
 .c.o:
-	gcc $(CFLAGS) -c -o $*.o $<
+	gcc $(PKG_CFLAGS) ${CFLAGS} -c -o $*.o $<
 
 .cpp.o:
-	g++ $(CFLAGS) -c -o $*.o $<
+	g++ $(PKG_CFLAGS) ${CFLAGS} -c -o $*.o $<
 
 clean:
 	rm -f *.o gpscorrelate gpscorrelate-gui