diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-20 10:12:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-20 10:12:24 -0700 |
| commit | 03b2e565503d383acc5f2867404cc39c0a2add80 (patch) | |
| tree | 3c1a0e152303319360f8b94cca14b49046204cb7 /Makefile | |
| parent | 15e3b5f4414d320dbace1bd3913b07d35bd9e9ee (diff) | |
| parent | 9a853c564c9bb47bc91e74d54d69443eeb4c3449 (diff) | |
| download | subsurface-03b2e565503d383acc5f2867404cc39c0a2add80.tar.gz | |
Merge git://github.com/sirowain/subsurface
* git://github.com/sirowain/subsurface:
Fix Segmentation fault when trying to print an empty plot.
Provide an icon for subsurface.
Added a comment about libusb dependency in Makefile.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -5,13 +5,15 @@ 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` + 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 subsurface: $(OBJS) $(CC) $(LDFLAGS) -o subsurface $(OBJS) \ - `xml2-config --libs` \ - `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \ + `xml2-config --libs` $(LIBS) \ $(LIBDIVECOMPUTERARCHIVE) -lpthread parse-xml.o: parse-xml.c dive.h |