| 1 |
hanno 08/12/01 18:35:03 |
| 2 |
|
| 3 |
Added: gpscorrelate-1.5.8-makefile.diff |
| 4 |
Log: |
| 5 |
gpscorrelate bump and makefile improvements |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpscorrelate/files/gpscorrelate-1.5.8-makefile.diff?rev=1.1&view=markup |
| 12 |
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 |
| 13 |
|
| 14 |
Index: gpscorrelate-1.5.8-makefile.diff |
| 15 |
=================================================================== |
| 16 |
--- gpscorrelate-1.5.8/Makefile 2008-10-31 12:50:39.000000000 +0100 |
| 17 |
+++ gpscorrelate-1.5.8-1/Makefile 2008-12-01 19:19:12.000000000 +0100 |
| 18 |
@@ -5,9 +5,10 @@ |
| 19 |
COBJS = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o |
| 20 |
GOBJS = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o |
| 21 |
CFLAGS = -Wall |
| 22 |
-override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2 |
| 23 |
+override CFLAGS += $(shell pkg-config --cflags libxml-2.0) $(shell pkg-config --cflags gtk+-2.0) -I/usr/include/exiv2 |
| 24 |
OFLAGS = -Wall |
| 25 |
override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2 |
| 26 |
+OFLAGS_GUI = $(shell pkg-config --libs gtk+-2.0) |
| 27 |
prefix = /usr/local |
| 28 |
bindir = $(prefix)/bin |
| 29 |
mandir = $(prefix)/share/man |
| 30 |
@@ -17,16 +18,16 @@ |
| 31 |
all: gpscorrelate gpscorrelate-gui gpscorrelate.1 |
| 32 |
|
| 33 |
gpscorrelate: $(COBJS) |
| 34 |
- gcc $(OFLAGS) -o $@ $(COBJS) |
| 35 |
+ $(CC) -o $@ $(COBJS) $(OFLAGS) $(LDFLAGS) |
| 36 |
|
| 37 |
gpscorrelate-gui: $(GOBJS) |
| 38 |
- gcc $(OFLAGS) -o $@ $(GOBJS) |
| 39 |
+ $(CC) -o $@ $(GOBJS) $(OFLAGS) $(OFLAGS_GUI) $(LDFLAGS) |
| 40 |
|
| 41 |
.c.o: |
| 42 |
- gcc $(CFLAGS) -c -o $*.o $< |
| 43 |
+ $(CC) $(CFLAGS) -c -o $*.o $< |
| 44 |
|
| 45 |
.cpp.o: |
| 46 |
- g++ $(CFLAGS) -c -o $*.o $< |
| 47 |
+ $(CXX) $(CFLAGS) -c -o $*.o $< |
| 48 |
|
| 49 |
clean: |
| 50 |
rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe} |
Archives