Merge hbonse's UI tweaks, but fixing the compile warnings. Also bringing it up to...

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 5bb40c217d62de9d4195a60d4507445ab06f63a4..8b5fd220f57e9729e98941cee4d6ed51f20e6527 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,21 @@
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
 
-OBJS=main.o profile.o info.o divelist.o parse.o
+OBJS=main.o dive.o profile.o info.o divelist.o parse-xml.o save-xml.o
 
-parse: $(OBJS)
-       $(CC) $(LDLAGS) -o parse $(OBJS) `xml2-config --libs` \
+divelog: $(OBJS)
+       $(CC) $(LDFLAGS) -o divelog $(OBJS) \
+               `xml2-config --libs` \
                `pkg-config --libs gtk+-2.0`
 
-parse.o: parse.c dive.h
-       $(CC) $(CFLAGS) -c `xml2-config --cflags` parse.c
+parse-xml.o: parse-xml.c dive.h
+       $(CC) $(CFLAGS) -c `xml2-config --cflags` parse-xml.c
+
+save-xml.o: save-xml.c dive.h
+       $(CC) $(CFLAGS) -c save-xml.c
+
+dive.o: dive.c dive.h
+       $(CC) $(CFLAGS) -c dive.c
 
 main.o: main.c dive.h display.h
        $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.c