[PATCH 3/3] declare a var for libdivecomputer's cflags
me at bearsh.org
me at bearsh.org
Mon Oct 17 09:54:01 EDT 2011
From: Martin Gysel <me at bearsh.org>
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 at bearsh.org>
---
Makefile | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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
--
1.7.7
More information about the subsurface
mailing list