X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=7e04f8f179a44c2a894bdd8fd44a89d38c635e7c;hb=9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f;hp=4a86ebfd7a40b2bb84d1faf8b464802a071ba850;hpb=4350a75b9455387c0da36b9b52349a858d8fca9c;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index 4a86ebf..7e04f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,45 @@
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
 
-OBJS=main.o profile.o info.o divelist.o parse-xml.o
+LIBDIVECOMPUTERDIR = /usr/local
+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
 
 divelog: $(OBJS)
-	$(CC) $(LDLAGS) -o divelog $(OBJS) \
+	$(CC) $(LDFLAGS) -o divelog $(OBJS) \
 		`xml2-config --libs` \
-		`pkg-config --libs gtk+-2.0`
+		`pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \
+		$(LIBDIVECOMPUTERARCHIVE)
 
 parse-xml.o: parse-xml.c dive.h
-	$(CC) $(CFLAGS) -c `xml2-config --cflags` parse-xml.c
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
+
+save-xml.o: save-xml.c dive.h
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c save-xml.c
+
+dive.o: dive.c dive.h
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c dive.c
+
+main.o: main.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
+		-c main.c
+
+profile.o: profile.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c profile.c
 
-main.o: main.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.c
+info.o: info.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c info.c
 
-profile.o: profile.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c profile.c
+equipment.o: equipment.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c equipment.c
 
-info.o: info.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c info.c
+divelist.o: divelist.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c divelist.c
 
-divelist.o: divelist.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c divelist.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