[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpscorrelate/files: gpscorrelate-1.5.8-makefile.diff

[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpscorrelate/files: gpscorrelate-1.5.8-makefile.diff

[Hanno Boeck (hanno)]

hanno       08/12/01 18:35:03

  Added:                gpscorrelate-1.5.8-makefile.diff
  Log:
  gpscorrelate bump and makefile improvements
  (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)

Revision  Changes    Path
1.1                  sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff?rev=1.1&content-type=text/plain

Index: gpscorrelate-1.5.8-makefile.diff
===================================================================
--- gpscorrelate-1.5.8/Makefile	2008-10-31 12:50:39.000000000 +0100
+++ gpscorrelate-1.5.8-1/Makefile	2008-12-01 19:19:12.000000000 +0100
@@ -5,9 +5,10 @@
 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
-override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
+override CFLAGS += $(shell pkg-config --cflags libxml-2.0) $(shell pkg-config --cflags gtk+-2.0) -I/usr/include/exiv2
 OFLAGS   = -Wall
 override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
+OFLAGS_GUI = $(shell pkg-config --libs gtk+-2.0)
 prefix   = /usr/local
 bindir   = $(prefix)/bin
 mandir   = $(prefix)/share/man
@@ -17,16 +18,16 @@
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
 gpscorrelate: $(COBJS)
-	gcc $(OFLAGS) -o $@ $(COBJS)
+	$(CC) -o $@ $(COBJS) $(OFLAGS) $(LDFLAGS)
 
 gpscorrelate-gui: $(GOBJS)
-	gcc $(OFLAGS) -o $@ $(GOBJS)
+	$(CC) -o $@ $(GOBJS) $(OFLAGS) $(OFLAGS_GUI) $(LDFLAGS)
 
 .c.o:
-	gcc $(CFLAGS) -c -o $*.o $<
+	$(CC) $(CFLAGS) -c -o $*.o $<
 
 .cpp.o:
-	g++ $(CFLAGS) -c -o $*.o $<
+	$(CXX) $(CFLAGS) -c -o $*.o $<
 
 clean:
 	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}