Fix profile and average depth for freedives

[ext/subsurface.git] / Makefile

diff --git a/Makefile b/Makefile
index 0d3340232b899948022b4083c39dcfca851e37b0..5bef6f2b0f2c9950242b960a42c54bcd98a7356e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.1
+VERSION=1.2
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
@@ -25,11 +25,10 @@ DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 XSLTFILES = xslt/*.xslt
 
-MACOSXINSTALL = /Applications/Subsurface.app
-MACOSXFILES = packaging/macosx
+UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win")
 
 # find libdivecomputer
-# First deal with the cross compile environment.
+# First deal with the cross compile environment and with Mac.
 # For the native case, Linus doesn't want to trust pkg-config given
 # how young libdivecomputer still is - so we check the typical
 # subdirectories of /usr/local and /usr and then we give up. You can
@@ -37,13 +36,14 @@ MACOSXFILES = packaging/macosx
 #
 ifeq ($(CC), i686-w64-mingw32-gcc)
 # ok, we are cross building for Windows
-       LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer
-       LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
-       LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
+       LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
+       LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
        RESFILE = packaging/windows/subsurface.res
        LDFLAGS += -Wl,-subsystem,windows
+else ifeq ($(UNAME), darwin)
+       LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
+       LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
 else
-
 libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
 libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
 libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
@@ -51,19 +51,19 @@ libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
 
 ifneq ($(strip $(libdc-local)),)
        LIBDIVECOMPUTERDIR = /usr/local
-       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
        LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
 else ifneq ($(strip $(libdc-local64)),)
        LIBDIVECOMPUTERDIR = /usr/local
-       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
        LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr)),)
        LIBDIVECOMPUTERDIR = /usr
-       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
        LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr64)),)
        LIBDIVECOMPUTERDIR = /usr
-       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+       LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
        LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else
 $(error Cannot find libdivecomputer - please edit Makefile)
@@ -87,8 +87,10 @@ GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0)
 GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
 CFLAGS += $(shell $(XSLCONFIG) --cflags)
 
-UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win")
-
+LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null)
+ifneq ($(strip $(LIBZIP)),)
+       ZIP = -DLIBZIP $(shell $(PKGCONFIG) --cflags libzip)
+endif
 
 ifeq ($(UNAME), linux)
        LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0)
@@ -98,6 +100,10 @@ ifeq ($(UNAME), linux)
 else ifeq ($(UNAME), darwin)
        OSSUPPORT = macos
        OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
+       MACOSXINSTALL = /Applications/Subsurface.app
+       MACOSXFILES = packaging/macosx
+       EXTRALIBS = $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation
+       CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration)
 else
        OSSUPPORT = windows
        OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
@@ -110,11 +116,11 @@ ifneq ($(strip $(LIBXSLT)),)
        endif
 endif
 
-LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) -lpthread
+LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm
 
 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 statistics.o $(OSSUPPORT).o $(RESFILE)
+       gtk-gui.o statistics.o file.o cochran.o $(OSSUPPORT).o $(RESFILE)
 
 $(NAME): $(OBJS)
        $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
@@ -141,12 +147,17 @@ install-macosx: $(NAME)
        $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
        $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
        $(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/
-       $(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/
 
+file.o: file.c dive.h file.h
+       $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) $(ZIP) -c file.c
+
+cochran.o: cochran.c dive.h file.h
+       $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) $(ZIP) -c cochran.c
+
 parse-xml.o: parse-xml.c dive.h
        $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) -c parse-xml.c
 
@@ -194,5 +205,8 @@ uemis.o: uemis.c dive.h uemis.h
 $(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h
        $(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c
 
+doc:
+       $(MAKE) -C Documentation doc
+
 clean:
        rm -f $(OBJS) *~ $(NAME)