Correctly plot dives ending below the surface

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 3fa77c3f4e800b8791c80f71d92de2c140c57630..20cbf8a578ba6f2d6673a27799f34c33106a7461 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,7 @@ DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 
 MACOSXINSTALL = /Applications/Subsurface.app
-MACOSXICONFILE = macosx/Subsurface.icns
-MACOSXINFOFILE = macosx/Info.plist
-MACOSXPKGFILE = macosx/PkgInfo
+MACOSXFILES = packaging/macosx
 
 # find libdivecomputer
 # First deal with the cross compile environment.
@@ -83,7 +81,7 @@ LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
 
 OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
        parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
-       gtk-gui.o $(RESFILE)
+       gtk-gui.o statistics.o $(RESFILE)
 
 $(NAME): $(OBJS)
        $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
@@ -95,7 +93,9 @@ install: $(NAME)
        $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
        $(INSTALL) -d -m 755 $(ICONDIR)
        $(INSTALL) $(ICONFILE) $(ICONDIR)
-       $(gtk_update_icon_cache)
+       @-if test -z "$(DESTDIR)"; then \
+               $(gtk_update_icon_cache); \
+       fi
        $(INSTALL) -d -m 755 $(MANDIR)
        $(INSTALL) -m 644 $(MANFILES) $(MANDIR)
 
@@ -109,9 +109,11 @@ install-macosx: $(NAME)
        $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
        $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
        $(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/
-       $(INSTALL) $(MACOSXINFOFILE) $(MACOSXINSTALL)/Contents/
-       $(INSTALL) $(MACOSXPKGFILE) $(MACOSXINSTALL)/Contents/
-       $(INSTALL) $(MACOSXICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+       $(INSTALL) $(MACOSXFILES)/subsurface.sh $(MACOSXINSTALL)/Contents/MacOS/
+       $(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/
+       $(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
+       $(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+       $(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
 
 parse-xml.o: parse-xml.c dive.h
        $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS)  parse-xml.c
@@ -134,6 +136,9 @@ info.o: info.c dive.h display.h display-gtk.h divelist.h
 equipment.o: equipment.c dive.h display.h divelist.h
        $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c equipment.c
 
+statistics.o: statistics.c dive.h display.h divelist.h
+       $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c statistics.c
+
 divelist.o: divelist.c dive.h display.h divelist.h
        $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c divelist.c