X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=20cbf8a578ba6f2d6673a27799f34c33106a7461;hb=c52b95d502fb79e52d5927b7c59addef984d23e2;hp=cc353f7d2edc5b1ae076a7f029c49bfff06d5d4f;hpb=89610335744582b29acb08da0e29837aa34a3dfa;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index cc353f7..20cbf8a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ ICONFILE = $(NAME).svg
 DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 
+MACOSXINSTALL = /Applications/Subsurface.app
+MACOSXFILES = packaging/macosx
+
 # find libdivecomputer
 # First deal with the cross compile environment.
 # For the native case, Linus doesn't want to trust pkg-config given
@@ -34,6 +37,8 @@ ifeq ($(CC), i686-w64-mingw32-gcc)
 	LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer
 	LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
 	LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
+	RESFILE = packaging/windows/subsurface.res
+	LDFLAGS += -Wl,-subsystem,windows
 else
 
 libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
@@ -76,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
+	gtk-gui.o statistics.o $(RESFILE)
 
 $(NAME): $(OBJS)
 	$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
@@ -88,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)
 
@@ -98,6 +105,16 @@ GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0)
 GCONF2CFLAGS =  $(shell $(PKGCONFIG) --cflags gconf-2.0)
 GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
 
+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/
+
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS)  parse-xml.c
 
@@ -119,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