mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

declare a var for libdivecomputer's cflags

Browse source 
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>
This commit is contained in:
Martin Gysel 2011-10-17 15:54:01 +02:00 committed by Linus Torvalds
parent e4d43901be
commit 3c5f9ebd78
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -47,6 +47,7 @@ LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
LIBXML2 = $(shell xml2-config --libs) LIBXML2 = $(shell xml2-config --libs)
LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0) LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB) LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread 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 libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h
$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \ $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \
-I$(LIBDIVECOMPUTERINCLUDES) \ $(LIBDIVECOMPUTERCFLAGS) \
-c libdivecomputer.c -c libdivecomputer.c
gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h 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` \ $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
-I$(LIBDIVECOMPUTERINCLUDES) \ $(LIBDIVECOMPUTERCFLAGS) \
-DVERSION_STRING='"v$(VERSION)"' \ -DVERSION_STRING='"v$(VERSION)"' \
-c gtk-gui.c -c gtk-gui.c