From 8677721e85a344e29782cfc2ab838edb8da9215b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 3 May 2013 11:04:51 -0700 Subject: Remove the majority of the Gtk related code - rip all Gtk code from qt-gui.cpp - don't compile Gtk specific files - don't link against Gtk libraries - don't compile modules we don't use at all (yet) - use #if USE_GTK_UI on the remaining files to disable Gtk related parts - disable the non-functional Cochran support while I'm at it Signed-off-by: Dirk Hohndel --- Makefile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1bb080363..4a13de5eb 100644 --- a/Makefile +++ b/Makefile @@ -42,33 +42,21 @@ HEADERS = \ SOURCES = \ - cochran.c \ deco.c \ device.c \ dive.c \ divelist.c \ - divelist-gtk.c \ download-dialog.c \ equipment.c \ file.c \ info.c \ - info-gtk.c \ - libdivecomputer.c \ main.c \ parse-xml.c \ - planner.c \ - planner-gtk.c \ prefs.c \ - print.c \ profile.c \ save-xml.c \ sha1.c \ - statistics.c \ - statistics-gtk.c \ time.c \ - uemis.c \ - uemis-downloader.c \ - webservice.c \ qt-gui.cpp \ qt-ui/addcylinderdialog.cpp \ qt-ui/addweightsystemdialog.cpp \ @@ -93,10 +81,12 @@ 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 @@ -118,7 +108,7 @@ else XSLTDIR = .\\xslt endif -LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ +LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) MSGLANGS=$(notdir $(wildcard po/*.po)) -- cgit v1.2.3-70-g09d2