X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=0c67f40f7838e6f0060606d5a501d80b59584254;hb=089ab5e97c50de9e0f566bda9e881e0e3c7cb0bf;hp=7e04f8f179a44c2a894bdd8fd44a89d38c635e7c;hpb=9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index 7e04f8f..0c67f40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,54 @@
+VERSION=1.0
+
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
+INSTALL=install
+
+prefix = $(HOME)
+DESTDIR = $(prefix)/bin
+NAME = subsurface
+
+# 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/*)
+
+ifneq ($(strip $(libdc-local)),)
+	LIBDIVECOMPUTERDIR = /usr/local
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = -L$(LIBDIVECOMPUTERDIR)/lib -ldivecomputer
+else ifneq ($(strip $(libdc-usr)),)
+	LIBDIVECOMPUTERDIR = /usr
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = -ldivecomputer
+else
+	$(error Cannot find libdivecomputer - please edit Makefile)
+endif
 
-LIBDIVECOMPUTERDIR = /usr/local
-LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+# Libusb-1.0 is only required if libdivecomputer was built with it.
+# And libdivecomputer is only built with it if libusb-1.0 is
+# installed. So get libusb if it exists, but don't complain
+# about it if it doesn't.
+LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
+
+LIBXML2 = $(shell xml2-config --libs)
+LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
+
+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
+	parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
+	gtk-gui.o
+
+$(NAME): $(OBJS)
+	$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
 
-divelog: $(OBJS)
-	$(CC) $(LDFLAGS) -o divelog $(OBJS) \
-		`xml2-config --libs` \
-		`pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \
-		$(LIBDIVECOMPUTERARCHIVE)
+install: $(NAME)
+	$(INSTALL) -d -m 755 $(DESTDIR)
+	$(INSTALL) $(NAME) $(DESTDIR)
 
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
@@ -24,13 +60,13 @@ dive.o: dive.c dive.h
 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c dive.c
 
 main.o: main.c dive.h display.h divelist.h
-	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
+	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0 gconf-2.0` \
 		-c main.c
 
 profile.o: profile.c dive.h display.h divelist.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c profile.c
 
-info.o: info.c dive.h display.h divelist.h
+info.o: info.c dive.h display.h display-gtk.h divelist.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c info.c
 
 equipment.o: equipment.c dive.h display.h divelist.h
@@ -39,7 +75,22 @@ equipment.o: equipment.c dive.h display.h divelist.h
 divelist.o: divelist.c dive.h display.h divelist.h
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c divelist.c
 
-libdivecomputer.o: libdivecomputer.c dive.h display.h
+print.o: print.c dive.h display.h display-gtk.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c print.c
+
+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) \
 			-c libdivecomputer.c
+
+gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
+			-I$(LIBDIVECOMPUTERINCLUDES) \
+			-DVERSION_STRING='"v$(VERSION)"' \
+			-c gtk-gui.c
+
+uemis.o: uemis.c uemis.h
+	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c uemis.c
+
+clean:
+	rm -f $(OBJS) *~ $(NAME)