diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-04 13:48:26 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-04 13:48:26 -0700 |
| commit | 3e0ecb5ff6a95e1be8f22359048e4dfa85d165bc (patch) | |
| tree | e792ec16bc5e353a224fcd84f4a8d9b41216a0eb /Makefile | |
| parent | 64c6a4278aedda3e0c435eb4df108817c85c1237 (diff) | |
| download | subsurface-3e0ecb5ff6a95e1be8f22359048e4dfa85d165bc.tar.gz | |
Remove leftovers from Gtk
No need to link against the osmgpsmaps or gconf2 anymore.
Also removed the Gtk related junk from linux.c.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -30,9 +30,9 @@ DESKTOPFILE = $(NAME).desktop MANFILES = $(NAME).1 XSLTFILES = xslt/*.xslt xslt/*.xsl -EXTRA_FLAGS = $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \ +EXTRA_FLAGS = $(QTCXXFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \ $(LIBDIVECOMPUTERCFLAGS) \ - $(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I. -DQT_NO_STL + $(LIBSOUPCFLAGS) -I. -DQT_NO_STL HEADERS = \ qt-ui/divelistview.h \ @@ -131,12 +131,6 @@ endif ifneq ($(strip $(LIBXSLT)),) EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS) endif -ifeq ($(USE_GTK_UI),1) -ifneq ($(strip $(LIBOSMGPSMAP)),) - SOURCES += gps.c - EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS) -endif -endif ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) SOURCES += linux.c @@ -159,8 +153,8 @@ else TARGET = $(NAME).exe endif -LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ - $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS) +LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBDIVECOMPUTER) \ + $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS) MSGLANGS=$(notdir $(wildcard po/*.po)) |