From: Martin Gysel <me@bearsh.org>
Date: Mon, 17 Oct 2011 13:54:01 +0000 (+0200)
Subject: declare a var for libdivecomputer's cflags
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=sidebyside;h=3c5f9ebd78c5af6396a5277856d0375b801c009e;p=ext%2Fsubsurface.git

declare a var for libdivecomputer's cflags

This allows us the specifiy libdivecomputer's cflags (and also the
library, static or dynamic) outside of the Makefile

Signed-off-by: Martin Gysel <me@bearsh.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/Makefile b/Makefile
index fb84c16..e946469 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
 
 LIBXML2 = $(shell xml2-config --libs)
 LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
 LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
 
 LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
@@ -99,12 +100,12 @@ print.o: print.c dive.h display.h display-gtk.h
 
 libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \
-			-I$(LIBDIVECOMPUTERINCLUDES) \
+			$(LIBDIVECOMPUTERCFLAGS) \
 			-c libdivecomputer.c
 
 gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
-			-I$(LIBDIVECOMPUTERINCLUDES) \
+			$(LIBDIVECOMPUTERCFLAGS) \
 			-DVERSION_STRING='"v$(VERSION)"' \
 			-c gtk-gui.c