diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-05 00:29:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:41:44 -0700 |
| commit | 4b12f28ca453b038fdeca8e6ada106e0c157296b (patch) | |
| tree | ae6c72da921baf80870ea57a5ec4ea9126fe201c /Configure.mk | |
| parent | 3e0ecb5ff6a95e1be8f22359048e4dfa85d165bc (diff) | |
| download | subsurface-4b12f28ca453b038fdeca8e6ada106e0c157296b.tar.gz | |
First steps towards removing glib dependencies
- remove the build flags and libraries from the Makefile / Configure.mk
- remove the glib types (gboolean, gchar, gint64, gint)
- comment out / hack around gettext
- replace the glib file helper functions
- replace g_ascii_strtod
- replace g_build_filename
- use environment variables instead of g_get_home_dir() & g_get_user_name()
- comment out GPS string parsing (uses glib utf8 macros)
This needs massive cleanup, but it's a snapshot of what I have right now, in
case people want to look at it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Configure.mk')
| -rw-r--r-- | Configure.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Configure.mk b/Configure.mk index 4039db454..eddd7c847 100644 --- a/Configure.mk +++ b/Configure.mk @@ -120,7 +120,7 @@ ifneq ($(filter reduce_relocations, $(shell $(PKGCONFIG) --variable qt_config $( QTCXXFLAGS += -fPIE endif -LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0) +# 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) @@ -135,13 +135,13 @@ 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) +#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) +#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)) |