diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
| commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
| tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /Configure.mk | |
| parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
| parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
| download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz | |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Configure.mk')
| -rw-r--r-- | Configure.mk | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/Configure.mk b/Configure.mk index ba5ff018c..9e9a2ba0e 100644 --- a/Configure.mk +++ b/Configure.mk @@ -113,20 +113,14 @@ endif RCC = $(shell $(PKGCONFIG) --variable=rcc_location QtGui) #endif -# we need GLIB2CFLAGS for gettext -QTCXXFLAGS = $(shell $(PKGCONFIG) --cflags $(QT_MODULES)) $(GLIB2CFLAGS) +QTCXXFLAGS = $(shell $(PKGCONFIG) --cflags $(QT_MODULES)) LIBQT = $(shell $(PKGCONFIG) --libs $(QT_MODULES)) ifneq ($(filter reduce_relocations, $(shell $(PKGCONFIG) --variable qt_config $(QT_CORE))), ) QTCXXFLAGS += -fPIE endif -LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0) -ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) - LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0) - GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0) -else ifeq ($(UNAME), darwin) +ifeq ($(UNAME), darwin) LDFLAGS += -framework CoreFoundation -framework CoreServices - GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler endif LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERINCLUDES) @@ -135,13 +129,7 @@ LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB) LIBXML2 = $(shell $(XML2CONFIG) --libs) LIBXSLT = $(shell $(XSLCONFIG) --libs) XML2CFLAGS = $(shell $(XML2CONFIG) --cflags) -GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0) -GTKCFLAGS += $(shell $(PKGCONFIG) --cflags gtk+-2.0) XSLCFLAGS = $(shell $(XSLCONFIG) --cflags) -OSMGPSMAPFLAGS += $(shell $(PKGCONFIG) --cflags osmgpsmap 2> /dev/null) -LIBOSMGPSMAP += $(shell $(PKGCONFIG) --libs osmgpsmap 2> /dev/null) -LIBSOUPCFLAGS = $(shell $(PKGCONFIG) --cflags libsoup-2.4) -LIBSOUP = $(shell $(PKGCONFIG) --libs libsoup-2.4) LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null) ZIPFLAGS = $(strip $(shell $(PKGCONFIG) --cflags libzip 2> /dev/null)) @@ -171,20 +159,10 @@ configure $(CONFIGURE): Configure.mk MOC = $(MOC)\\\ UIC = $(UIC)\\\ RCC = $(RCC)\\\ - LIBGTK = $(LIBGTK)\\\ - GTKCFLAGS = $(GTKCFLAGS)\\\ - LIBGCONF2 = $(LIBGCONF2)\\\ - GCONF2CFLAGS = $(GCONF2CFLAGS)\\\ - GTK_MAC_BUNDLER = $(GTK_MAC_BUNDLER)\\\ LIBXML2 = $(LIBXML2)\\\ LIBXSLT = $(LIBXSLT)\\\ XML2CFLAGS = $(XML2CFLAGS)\\\ - GLIB2CFLAGS = $(GLIB2CFLAGS)\\\ XSLCFLAGS = $(XSLCFLAGS)\\\ - OSMGPSMAPFLAGS = $(OSMGPSMAPFLAGS)\\\ - LIBOSMGPSMAP = $(LIBOSMGPSMAP)\\\ - LIBSOUPCFLAGS = $(LIBSOUPCFLAGS)\\\ - LIBSOUP = $(LIBSOUP)\\\ LIBZIP = $(LIBZIP)\\\ ZIPFLAGS = $(ZIPFLAGS)\\\ LIBSQLITE3 = $(LIBSQLITE3)\\\ |