diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 12:21:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 12:21:20 -0700 |
commit | b2f0912ee5728d3d8705f0d84f5699c182ef8916 (patch) | |
tree | d0a50120b5343f674533727b4c9c940962991035 /Makefile | |
parent | 50fd8191f98ac18458adb2a0caa6b35fb32f6b14 (diff) | |
download | subsurface-b2f0912ee5728d3d8705f0d84f5699c182ef8916.tar.gz |
Clean up library handling
.. and pick up libusb-1.0 automatically if it's installed.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -5,17 +5,24 @@ LIBDIVECOMPUTERDIR = /usr/local LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a -# Add libusb in case of libdivecomputer compiled with usb support. -LIBS = `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` +# Libusb-1.0 is only required if libdivecomputer was built with it. +# And libdivecomputer is only built with it if libusb-1.0 is +# installed. So get libusb if it exists, but don't complain +# about it if it doesn't. +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) +LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB) + +LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \ gtk-gui.o subsurface: $(OBJS) - $(CC) $(LDFLAGS) -o subsurface $(OBJS) \ - `xml2-config --libs` $(LIBS) \ - $(LIBDIVECOMPUTERARCHIVE) -lpthread + $(CC) $(LDFLAGS) -o subsurface $(OBJS) $(LIBS) parse-xml.o: parse-xml.c dive.h $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags` parse-xml.c |