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

diff --git a/Makefile b/Makefile
index e946469..cd9fcdd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.0
+VERSION=1.1
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
@@ -24,17 +24,27 @@ MANFILES = $(NAME).1
 # 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 = $(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 = $(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)
 endif
@@ -45,6 +55,10 @@ 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)
@@ -67,9 +81,19 @@ install: $(NAME)
 	$(INSTALL) -d -m 755 $(ICONDIR)
 	$(INSTALL) $(ICONFILE) $(ICONDIR)
 	$(gtk_update_icon_cache)
-	$(INSTALL) -d -m 644 $(MANDIR)
-	$(INSTALL) $(MANFILES) $(MANDIR)
+	$(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
 
@@ -103,7 +127,7 @@ libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecompu
 			$(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` \
 			$(LIBDIVECOMPUTERCFLAGS) \
 			-DVERSION_STRING='"v$(VERSION)"' \