diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-05-18 11:40:53 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-18 17:18:19 -0700 |
| commit | 80274b578899772a6c45682029cbce56ebc1eccb (patch) | |
| tree | 264e92a164e03bcf407b36da62b1fc057f2fb162 | |
| parent | 29b99d4e1a529e95372106e69745f6079d96ff70 (diff) | |
| download | subsurface-80274b578899772a6c45682029cbce56ebc1eccb.tar.gz | |
Add a variable for the Marble library name
I need that for a Marble installed somewhere other than the linker's
default search path.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Configure.mk | 2 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Configure.mk b/Configure.mk index 745b03ce1..c7b6ba5bf 100644 --- a/Configure.mk +++ b/Configure.mk @@ -149,6 +149,7 @@ SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3)) # Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed # Check if it's present by trying to compile MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE") +MARBLELIBS = -lmarblewidget # Write the configure file all: configure @@ -186,6 +187,7 @@ configure $(CONFIGURE): Configure.mk LIBSQLITE3 = $(LIBSQLITE3)\\\ SQLITE3FLAGS = $(SQLITE3FLAGS)\\\ MARBLEFLAGS = $(MARBLEFLAGS)\\\ + MARBLELIBS = $(MARBLELIBS)\\\ " | tr '\\' '\n' > $(CONFIGFILE) else @@ -119,7 +119,7 @@ else endif LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ - $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -lmarblewidget + $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS) MSGLANGS=$(notdir $(wildcard po/*.po)) |