summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-11-19 16:26:16 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-11-19 16:26:16 -0800
commitad0f91deca1a82f6ec4b53df966f9b50b64c8a78 (patch)
treef99dd1dcb7dcad608cef28cb7e9cfdb93106c4c0
parentcdbdf40848d46a1210d6c47f0b51c7f0be8f57b2 (diff)
downloadsubsurface-ad0f91deca1a82f6ec4b53df966f9b50b64c8a78.tar.gz
Makefile hack to allow building with uninstalled libdivecomputer
Simply call "make LIBDCDEVEL=1" and the libdivecomputer includefiles are expected in ../libdivecomputer/include and the actual library is linked from ../libdivecomputer/src/.libs Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 90403c4f1..ee74d4b98 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,11 @@ 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)),)
+ifneq ($(LIBDCDEVEL),)
+ LIBDIVECOMPUTERDIR = ../libdivecomputer
+ LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
+ LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/src/.libs/libdivecomputer.a
+else ifneq ($(strip $(libdc-local)),)
LIBDIVECOMPUTERDIR = /usr/local
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a