Rename 'cylinder.c' as 'equipment.c'

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 6e6732e6e8f2988a03960949b9f6b740a0452c54..787a74feefa7d59799be666b3314f0d3c566abe2 100644 (file)
--- 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 equipment.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
+
+equipment.o: equipment.c dive.h display.h divelist.h
+       $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c equipment.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