summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-08-23 19:41:53 +0300
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-08-23 19:46:07 +0300
commitea67aa34a255b8f368e7a7afd965e584db01ae56 (patch)
tree650b4643ad4f18c801e3b7e3dc85e50b201c27e3
parent609e8293f19be189b05ff4df505cae9b0aac0eb4 (diff)
Don't provide a client-side library
For rationale: https://bugs.freedesktop.org/show_bug.cgi?id=68439#c5
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am46
-rw-r--r--src/geoclue-2.0.pc.in2
-rw-r--r--src/geoclue.h29
4 files changed, 0 insertions, 82 deletions
diff --git a/configure.ac b/configure.ac
index a98d92f..dcc4fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,6 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-# GObject-introspection support
-GOBJECT_INTROSPECTION_REQUIRE([0.9.6])
-
# Mallard help
YELP_HELP_INIT
@@ -125,8 +122,6 @@ else
fi
AC_SUBST(DBUS_SYS_DIR)
-GOBJECT_INTROSPECTION_CHECK([0.6.2])
-
AC_CONFIG_FILES([
Makefile
src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 2caab68..74e6d71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,55 +44,9 @@ geoclue_CFLAGS = $(GEOCLUE_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\""
geoclue_LDADD = $(GEOCLUE_LIBS) $(LIBS)
-lib_LTLIBRARIES = libgeoclue-1.0.la
-libgeoclue_1_0_ladir = $(includedir)/geoclue-1.0
-
-libgeoclue_1_0_la_HEADERS = geoclue.h geoclue-interface.h
-libgeoclue_1_0_la_SOURCES = geoclue-interface.c
-libgeoclue_1_0_la_CFLAGS = $(GEOCLUE_CFLAGS)
-libgeoclue_1_0_la_LIBADD = $(GEOCLUE_LIBS)
-
CLEANFILES = $(BUILT_SOURCES)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = geoclue-2.0.pc
-if HAVE_INTROSPECTION
-girdir = $(datadir)/gir-1.0
-gir_DATA = Geoclue-1.0.gir
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Geoclue-1.0.typelib
-
-Geoclue-1.0.gir: $(libgeoclue_1_0_la_SOURCES) $(libgeoclue_1_0_la_HEADERS)
- $(INTROSPECTION_SCANNER) -v \
- --warn-all \
- --namespace Geoclue \
- --identifier-prefix=GClue \
- --symbol-prefix=gclue \
- --nsversion=1.0 \
- --include=Gio-2.0 \
- --library=geoclue-1.0 \
- --output $@ \
- --pkg=glib-2.0 \
- --pkg=gobject-2.0 \
- --pkg=gio-2.0 \
- --pkg-export=geoclue-1.0 \
- --libtool=$(top_builddir)/libtool \
- --c-include='geoclue.h' \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- $^ \
- $(NULL)
-
-Geoclue-1.0.gir: libgeoclue-1.0.la $(INTROSPECTION_SCANNER) Makefile.am
-Geoclue-1.0.typelib: Geoclue-1.0.gir $(INTROSPECTION_COMPILER)
- $(INTROSPECTION_COMPILER) $< -o $@
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-EXTRA_DIST = geoclue-interface.xml \
- test-data/freegeoip-results.json
-
-endif # HAVE_INTROSPECTION
-
-include $(top_srcdir)/git.mk
diff --git a/src/geoclue-2.0.pc.in b/src/geoclue-2.0.pc.in
index 5b8bd5f..7b9a1d1 100644
--- a/src/geoclue-2.0.pc.in
+++ b/src/geoclue-2.0.pc.in
@@ -1,7 +1,5 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
Name: Geoclue
Description: The Geoinformation Service
diff --git a/src/geoclue.h b/src/geoclue.h
deleted file mode 100644
index 3a247b8..0000000
--- a/src/geoclue.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* geoclue.h
- *
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * Geoclue is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * Geoclue is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with Geoclue; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
- */
-
-#ifndef __GEOCLUE_H__
-#define __GEOCLUE_H__
-
-#include <glib-object.h>
-
-#include <geoclue-interface.h>
-
-#endif