X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=ddd96745884561cd9351a88c57bdfc6d1d3e7883;hb=9437a6512a3b353197146c077c1816f0565e0981;hp=6e6732e6e8f2988a03960949b9f6b740a0452c54;hpb=1155ad3f0fb2471163335d1d7c6856a81f495e49;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index 6e6732e..ddd9674 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,34 @@
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
 
-OBJS=main.o profile.o info.o divelist.o parse-xml.o save-xml.o
+OBJS=main.o dive.o profile.o info.o cylinders.o divelist.o parse-xml.o save-xml.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`
 
 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) -c save-xml.c
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c save-xml.c
 
-main.o: main.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.c
+dive.o: dive.c dive.h
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c dive.c
 
-profile.o: profile.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c profile.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
 
-info.o: info.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c info.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
 
-divelist.o: divelist.c dive.h display.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c divelist.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
+
+cylinders.o: cylinders.c dive.h display.h divelist.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c cylinders.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