diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | libdivecomputer.h | 14 |
2 files changed, 7 insertions, 15 deletions
@@ -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 633b3b1b1..8d77a25be 100644 --- 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" |