diff options
| author |  Martin Gysel <me@bearsh.org> | 2011-10-17 15:54:01 +0200 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-17 10:48:40 -0700 |
| commit | 3c5f9ebd78c5af6396a5277856d0375b801c009e (patch) | |
| tree | f3ecbc0d306a9645e06b7da46a50bad14f0f5d1e /Makefile | |
| parent | e4d43901bee4268a035674fcff794064557f238a (diff) | |
| download | subsurface-3c5f9ebd78c5af6396a5277856d0375b801c009e.tar.gz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |