Update for libdivecomputer pkg-config include file changes

Subsurface doesn't compile on OS X any more, because libdivecomputer
changed the way the header inclusion works: the include path from
pkg-config no longer includes the final "libdivecomputer" component, and
instead of doing

  #include <header.h>

for libdivecomputer headers, we're now supposed to do

  #include <libdivecomputer/header.h>

instead. Which is cleaner anyway.

The reason this only bit us on OS X is that I never trusted pkg-config
that much for non-system libraries on Linux (maybe it works, maybe it
doesn't, I've seen it go both ways), so on Linux we just used our own
version of the include path, and thus weren't affected by the
libdivecomputer config change.

Clean up the includes while at it - we no longer need (or want) the
device-specific header files, since we just use the generic functions.

Reported-by: Grischa Toedt <toedt@embl.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Makefile b/Makefile
index 20dff4c857f11d5d9286245e9d43c8a5d6b63aa0..5bef6f2b0f2c9950242b960a42c54bcd98a7356e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)

diff --git a/libdivecomputer.h b/libdivecomputer.h
index 633b3b1b1fa439f4b00312b58ad47091d31e1137..8d77a25beba9230e51e20be293960d9f28f048d3 100644 (file)
--- a/libdivecomputer.h
+++ b/libdivecomputer.h
@@ -2,17 +2,9 @@
 #define LIBDIVECOMPUTER_H
 
 /* libdivecomputer */
-#include <device.h>
-#include <suunto.h>
-#include <reefnet.h>
-#include <uwatec.h>
-#include <oceanic.h>
-#include <mares.h>
-#include <hw.h>
-#include <cressi.h>
-#include <zeagle.h>
-#include <atomics.h>
-#include <utils.h>
+#include <libdivecomputer/device.h>
+#include <libdivecomputer/parser.h>
+#include <libdivecomputer/utils.h>
 
 /* handling uemis Zurich SDA files */
 #include "uemis.h"