Merge branch 'for-linus' of git://github.com/dirkhh/subsurface

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 7e04f8f179a44c2a894bdd8fd44a89d38c635e7c..2f24eb7de8f589119c3c97948a9bac0da6b5d82f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,13 @@ LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
 LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
 
 OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
-       parse-xml.o save-xml.o libdivecomputer.o
+       parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o
 
-divelog: $(OBJS)
-       $(CC) $(LDFLAGS) -o divelog $(OBJS) \
+subsurface: $(OBJS)
+       $(CC) $(LDFLAGS) -o subsurface $(OBJS) \
                `xml2-config --libs` \
                `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \
-               $(LIBDIVECOMPUTERARCHIVE)
+               $(LIBDIVECOMPUTERARCHIVE) -lpthread
 
 parse-xml.o: parse-xml.c dive.h
        $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
@@ -39,7 +39,13 @@ equipment.o: equipment.c dive.h display.h divelist.h
 divelist.o: divelist.c dive.h display.h divelist.h
        $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c divelist.c
 
+print.o: print.c dive.h display.h
+       $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c print.c
+
 libdivecomputer.o: libdivecomputer.c dive.h display.h
        $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \
                        -I$(LIBDIVECOMPUTERINCLUDES) \
                        -c libdivecomputer.c
+
+uemis.o: uemis.c uemis.h
+       $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c uemis.c