X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=cd9fcdd6fc8f6f698987112489ea38535f05c58a;hb=5ca49b0460f36ac969b7ef388f586782d584b36d;hp=0c67f40f7838e6f0060606d5a501d80b59584254;hpb=089ab5e97c50de9e0f566bda9e881e0e3c7cb0bf;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index 0c67f40..cd9fcdd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,52 @@
-VERSION=1.0
+VERSION=1.1
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
 INSTALL=install
 
-prefix = $(HOME)
-DESTDIR = $(prefix)/bin
+# these locations seem to work for SuSE and Fedora
+# prefix = $(HOME)
+prefix = $(DESTDIR)/usr
+BINDIR = $(prefix)/bin
+DATADIR = $(prefix)/share
+DESKTOPDIR = $(DATADIR)/applications
+ICONPATH = $(DATADIR)/icons/hicolor
+ICONDIR = $(ICONPATH)/scalable/apps
+MANDIR = $(DATADIR)/man/man1
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
+
 NAME = subsurface
+ICONFILE = $(NAME).svg
+DESKTOPFILE = $(NAME).desktop
+MANFILES = $(NAME).1
 
 # find libdivecomputer; we don't trust pkg-config here given how young
 # libdivecomputer still is - so we check /usr/local and /usr and then we
 # give up. You can override by simply setting it here
 #
-libdc-local := $(wildcard /usr/local/include/libdivecomputer/*)
-libdc-usr := $(wildcard /usr/include/libdivecomputer/*)
+libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
+libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
+libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
+libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
 
 ifneq ($(strip $(libdc-local)),)
 	LIBDIVECOMPUTERDIR = /usr/local
 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-	LIBDIVECOMPUTERARCHIVE = -L$(LIBDIVECOMPUTERDIR)/lib -ldivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+else ifneq ($(strip $(libdc-local64)),)
+	LIBDIVECOMPUTERDIR = /usr/local
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr)),)
 	LIBDIVECOMPUTERDIR = /usr
 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-	LIBDIVECOMPUTERARCHIVE = -ldivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+else ifneq ($(strip $(libdc-usr64)),)
+	LIBDIVECOMPUTERDIR = /usr
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else
-	$(error Cannot find libdivecomputer - please edit Makefile)
+$(error Cannot find libdivecomputer - please edit Makefile)
 endif
 
 # Libusb-1.0 is only required if libdivecomputer was built with it.
@@ -33,8 +55,13 @@ endif
 # about it if it doesn't.
 LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
 
+# it appears that xml2-config isn't included in the libxml2 package for
+# MinGW - so under Windows you may want to replace this with a hardcoded
+# path to the installdir - something like
+# LIBXML2 = -L/c/opt/gtk/lib -lxml2
 LIBXML2 = $(shell xml2-config --libs)
 LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
 LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
 
 LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
@@ -47,9 +74,26 @@ $(NAME): $(OBJS)
 	$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
 
 install: $(NAME)
-	$(INSTALL) -d -m 755 $(DESTDIR)
-	$(INSTALL) $(NAME) $(DESTDIR)
+	$(INSTALL) -d -m 755 $(BINDIR)
+	$(INSTALL) $(NAME) $(BINDIR)
+	$(INSTALL) -d -m 755 $(DESKTOPDIR)
+	$(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
+	$(INSTALL) -d -m 755 $(ICONDIR)
+	$(INSTALL) $(ICONFILE) $(ICONDIR)
+	$(gtk_update_icon_cache)
+	$(INSTALL) -d -m 755 $(MANDIR)
+	$(INSTALL) -m 644 $(MANFILES) $(MANDIR)
+
+# it appears that xml2-config isn't included in the libxml2 package for
+# MinGW - so under Windows you may want to replace this with a hardcoded
+# path to the inclde dir - something like
+#
+# XML2INCLUDE = -I/c/opt/gtk/include/libxml2
+#
+# parse-xml.o: parse-xml.c dive.h
+#	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c $(XML2INCLUDE)  parse-xml.c
 
+ 
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
 
@@ -80,12 +124,12 @@ print.o: print.c dive.h display.h display-gtk.h
 
 libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \
-			-I$(LIBDIVECOMPUTERINCLUDES) \
+			$(LIBDIVECOMPUTERCFLAGS) \
 			-c libdivecomputer.c
 
-gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
+gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h Makefile
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
-			-I$(LIBDIVECOMPUTERINCLUDES) \
+			$(LIBDIVECOMPUTERCFLAGS) \
 			-DVERSION_STRING='"v$(VERSION)"' \
 			-c gtk-gui.c