diff options
author | Zeeshan Ali <zeenix@gmail.com> | 2017-07-17 18:40:13 +0200 |
---|---|---|
committer | Zeeshan Ali <zeenix@gmail.com> | 2017-07-17 19:09:33 +0200 |
commit | baaceda563df58c0eb0b5d8cdd48af74c10ff78b (patch) | |
tree | 955af85e72c849bb973992d2e0416524d8606c54 | |
parent | dcaf9177977a62ae53db4649bac7c327e0338eff (diff) | |
download | geocode-glib-wip/meson.tar.gz |
Drop autotools supportwip/meson
We can now build geocode-glib with meson.
https://bugzilla.gnome.org/show_bug.cgi?id=785033
-rw-r--r-- | Makefile.am | 46 | ||||
-rwxr-xr-x | autogen.sh | 38 | ||||
-rw-r--r-- | configure.ac | 115 | ||||
-rw-r--r-- | docs/Makefile.am | 96 | ||||
-rw-r--r-- | geocode-glib/Makefile.am | 117 | ||||
-rw-r--r-- | geocode-glib/tests/Makefile.am | 55 | ||||
-rw-r--r-- | icons/Makefile.am | 51 |
7 files changed, 0 insertions, 518 deletions
diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 722a2ce..0000000 --- a/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = geocode-glib po docs icons - -EXTRA_DIST = \ - glib-tap.mk \ - gtk-doc.make \ - tap-test \ - $(NULL) - -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc=yes --enable-introspection=yes - -DISTCLEANFILES = gtk-doc.make - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - build-aux/ \ - build-aux/tap-driver.sh \ - INSTALL \ - omf.make \ - gtk-doc.make \ - ABOUT-NLS \ - config.rpath \ - m4/ \ - po/Makevars.template \ - po/Rules-quot \ - po/boldquot.sed \ - po/en@boldquot.header \ - po/en@quot.header \ - po/insert-header.sin \ - po/quot.sed \ - po/remove-potcdate.sin \ - m4/gtk-doc.m4 \ - geocode-glib-1.0.pc \ - $(NULL) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = geocode-glib-1.0.pc - -# Build ChangeLog from git history -@GENERATE_CHANGELOG_RULES@ -dist-hook: dist-ChangeLog - --include $(top_srcdir)/git.mk diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index b6efba6..0000000 --- a/autogen.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -test -n "$srcdir" || srcdir=$(dirname "$0") -test -n "$srcdir" || srcdir=. - -olddir=$(pwd) - -cd $srcdir - -(test -f configure.ac) || { - echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" - exit 1 -} - -# shellcheck disable=SC2016 -PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 - echo "*** If you wish to pass any to it, please specify them on the" >&2 - echo "*** '$0' command line." >&2 - echo "" >&2 -fi - -aclocal --install || exit 1 -gtkdocize --copy || exit 1 -autoreconf --verbose --force --install || exit 1 - -cd "$olddir" -if [ "$NOCONFIGURE" = "" ]; then - $srcdir/configure "$@" || exit 1 - - if [ "$1" = "--help" ]; then exit 0 else - echo "Now type 'make' to compile $PKG_NAME" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 3f93667..0000000 --- a/configure.ac +++ /dev/null @@ -1,115 +0,0 @@ -AC_PREREQ([2.63]) - -m4_define(gclib_version_major, 3) -m4_define(gclib_version_minor, 23) -m4_define(gclib_version_micro, 90) - -AC_INIT([geocode-glib], - [gclib_version_major.gclib_version_minor.gclib_version_micro], - [http://bugzilla.gnome.org/enter_bug.cgi?product=geocode-glib], - [geocode-glib]) -AX_IS_RELEASE([git-directory]) - -AC_CONFIG_SRCDIR([geocode-glib/geocode-glib.c]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) - -AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip check-news subdir-objects]) -AX_CHECK_ENABLE_DEBUG([yes]) - -# Before making a release, the GCLIB_LT_VERSION string should be modified. -# The string is of the form C:R:A. -# - If interfaces have been changed or added, but binary compatibility has -# been preserved, change to C+1:0:A+1 -# - If binary compatibility has been broken (eg removed or changed interfaces) -# change to C+1:0:0 -# - If the interface is the same as the previous version, change to C:R+1:A -GCLIB_LT_VERSION=0:0:0 -AC_SUBST(GCLIB_LT_VERSION) - -GCLIB_API_VERSION=1.0 -AC_SUBST(GCLIB_API_VERSION) - -AM_MAINTAINER_MODE([enable]) - -# Support silent build rules, requires at least automake-1.11. Disable -# by either passing --disable-silent-rules to configure or passing V=1 -# to make -AM_SILENT_RULES([yes]) - -# Check for programs -AC_PROG_CC -AC_PROG_INSTALL -AC_LANG([C]) - -dnl Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([disable-static]) - -# i18n support -# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION -AM_GNU_GETTEXT_VERSION([0.19.6]) -AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) -AM_GNU_GETTEXT([external]) - -GETTEXT_PACKAGE=geocode-glib -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The name of the gettext domain]) - -dnl gtk-doc checks -GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) - -AC_CHECK_LIB([m],[atan2]) - -dnl Requires for the library -PKG_CHECK_MODULES(GEOCODE, - gio-2.0 >= 2.44 - json-glib-1.0 >= 0.99.2 - libsoup-2.4 >= 2.42) - -GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -AC_SUBST(GLIB_GENMARSHAL) - -GOBJECT_INTROSPECTION_CHECK([0.6.3]) - -AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS]) - -GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -AC_SUBST(GLIB_MKENUMS) - -# installed-tests -AC_ARG_ENABLE([always_build_tests], - AS_HELP_STRING([--enable-always-build-tests], - [Enable always building tests (default: yes)]),, - [enable_always_build_tests=yes]) -AC_ARG_ENABLE([installed_tests], - AS_HELP_STRING([--enable-installed-tests], - [Install test programs (default: no)]),, - [enable_installed_tests=no]) - -AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], - [test "$enable_always_build_tests" = "yes"]) -AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests]) - -AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], - [test "$enable_installed_tests" = "yes"]) -AC_SUBST([ENABLE_INSTALLED_TESTS],[$enable_installed_tests]) - -# Changelog generation -AX_GENERATE_CHANGELOG - -AC_CONFIG_FILES([ - Makefile - geocode-glib-1.0.pc - docs/Makefile - docs/version.xml - geocode-glib/Makefile - geocode-glib/tests/Makefile - po/Makefile.in - icons/Makefile -]) -AC_OUTPUT - diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 831bbf7..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE=geocode-glib - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=$(top_srcdir)/geocode-glib - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-sections - -DOC_MODULE_VERSION=@GCLIB_API_VERSION@ - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=geocode_ - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS= - -# Add the builddir to the HTML path so that version.xml is found -MKHTML_OPTIONS=--path="$(abs_builddir)" - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/geocode-glib/geocode-*.h -CFILE_GLOB=$(top_srcdir)/geocode-glib/geocode-*.c - -# Header files to ignore when scanning. -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES = \ - geocode-glib-private.h \ - geocode-nominatim-test.h \ - geocode-enum-types.h \ - $(NULL) - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files=version.xml - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(GEOCODE_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/geocode-glib/libgeocode-glib.la - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += version.xml.in - -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = DOC_MODULE=$(DOC_MODULE) \ - DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -TESTS = $(GTKDOC_CHECK) -endif - --include $(top_srcdir)/git.mk diff --git a/geocode-glib/Makefile.am b/geocode-glib/Makefile.am deleted file mode 100644 index db922d5..0000000 --- a/geocode-glib/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -SUBDIRS = . tests - -EXTRA_DIST = geocode-glib.symbols - -BUILT_GIRSOURCES = - -lib_LTLIBRARIES = libgeocode-glib.la - -libgeocode_glib_la_PUBLICSOURCES = \ - geocode-backend.c \ - geocode-mock-backend.c \ - geocode-nominatim.c \ - geocode-location.c \ - geocode-forward.c \ - geocode-reverse.c \ - geocode-glib.c \ - geocode-error.c \ - geocode-enum-types.c \ - geocode-place.c \ - geocode-bounding-box.c - -libgeocode_glib_la_SOURCES = \ - $(libgeocode_glib_la_PUBLICSOURCES) \ - geocode-glib-private.h - -libgeocode_glib_la_LIBADD = $(GEOCODE_LIBS) $(LIBS) - -libgeocode_glib_la_LDFLAGS = \ - -version-info $(GCLIB_LT_VERSION) \ - -no-undefined \ - $(WARN_LDFLAGS) \ - $(AM_LDFLAGS) \ - -export-symbols $(srcdir)/geocode-glib.symbols - -GCGLIB_HEADER_FILES = \ - geocode-glib.h \ - geocode-backend.h \ - geocode-mock-backend.h \ - geocode-nominatim.h \ - geocode-location.h \ - geocode-forward.h \ - geocode-reverse.h \ - geocode-error.h \ - geocode-place.h \ - geocode-bounding-box.h - -gcglibdir = $(includedir)/$(PACKAGE)-$(GCLIB_API_VERSION)/$(PACKAGE) -gcglib_HEADERS = \ - $(GCGLIB_HEADER_FILES) \ - geocode-enum-types.h - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" \ - -DGEOCODE_LOCALEDIR=\"$(localedir)\" - -AM_CFLAGS = $(GEOCODE_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) - -BUILT_SOURCES = \ - geocode-enum-types.c \ - geocode-enum-types.h - -geocode-enum-types.h: $(GCGLIB_HEADER_FILES) - $(AM_V_GEN) ($(GLIB_MKENUMS) \ - --fhead "#ifndef __GEOCODE_ENUM_TYPES_H__\n#define __GEOCODE_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n\n/**\n * SECTION:geocode-enum-types\n * @short_description: Geocode enumerated types\n * @include: geocode-glib/geocode-glib.h\n *\n * The enumerated types defined and used by geocode-glib.\n */\n\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GEOCODE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __GEOCODE_ENUM_TYPES_H__ */" $^ > xgen-$(@F) \ - && mv -f xgen-$(@F) $@) - -geocode-enum-types.c: $(GCGLIB_HEADER_FILES) geocode-enum-types.h - $(AM_V_GEN) ($(GLIB_MKENUMS) \ - --fhead "#include <geocode-glib/geocode-glib.h>\n#include <geocode-glib/geocode-enum-types.h>" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" $^ > xgen-$(@F) \ - && mv -f xgen-$(@F) $@) - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) -CLEANFILES = - -if HAVE_INTROSPECTION -introspection_files = $(libgeocode_glib_la_PUBLICSOURCES) $(gcglib_HEADERS) - -GeocodeGlib-1.0.gir: libgeocode-glib.la -GeocodeGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Json-1.0 Soup-2.4 -GeocodeGlib_1_0_gir_PACKAGES = gobject-2.0 gmodule-2.0 glib-2.0 gio-2.0 libsoup-2.4 json-glib-1.0 -GeocodeGlib_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -GeocodeGlib_1_0_gir_LIBS = libgeocode-glib.la -GeocodeGlib_1_0_gir_SCANNERFLAGS = \ - --symbol-prefix=geocode \ - --identifier-prefix=Geocode \ - --pkg-export=geocode-glib-1.0 \ - --c-include="geocode-glib/geocode-glib.h" \ - $(WARN_SCANNERFLAGS) \ - $(NULL) -GeocodeGlib_1_0_gir_FILES = $(introspection_files) -INTROSPECTION_GIRS += GeocodeGlib-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) - -endif # HAVE_INTROSPECTION - -MAINTAINERCLEANFILES = Makefile.in - --include $(top_srcdir)/git.mk diff --git a/geocode-glib/tests/Makefile.am b/geocode-glib/tests/Makefile.am deleted file mode 100644 index f5087a1..0000000 --- a/geocode-glib/tests/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -include $(top_srcdir)/glib-tap.mk - -installed_testdir = $(libexecdir)/installed-tests/geocode-glib-@GCLIB_API_VERSION@ -installed_test_metadir = $(datadir)/installed-tests/geocode-glib-@GCLIB_API_VERSION@ - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - $(GEOCODE_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(WARN_LDFLAGS) \ - $(NULL) - -LDADD = \ - $(top_builddir)/geocode-glib/libgeocode-glib.la \ - $(GEOCODE_LIBS) \ - $(NULL) - -test_programs = \ - geo-uri \ - geocode-glib \ - mock-backend \ - $(NULL) - -geo_uri_SOURCES = geo-uri.c -geocode_glib_SOURCES = \ - geocode-nominatim-test.h \ - geocode-nominatim-test.c \ - geocode-glib.c -mock_backend_SOURCES = mock-backend.c - -dist_test_data = \ - locale_format.json \ - locale_name.json \ - nominatim-area.json \ - nominatim-no-results.json \ - nominatim-rio.json \ - osm_type0.json \ - osm_type1.json \ - osm_type2.json \ - pub.json \ - rev.json \ - rev_fail.json \ - search.json \ - search_lat_long.json \ - xep.json \ - $(NULL) - --include $(top_srcdir)/git.mk diff --git a/icons/Makefile.am b/icons/Makefile.am deleted file mode 100644 index 4d82719..0000000 --- a/icons/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -public_icons = \ - scalable_places_poi-airport.svg \ - scalable_places_poi-building.svg \ - scalable_places_poi-bus-stop.svg \ - scalable_places_poi-car.svg \ - scalable_places_poi-marker.svg \ - scalable_places_poi-railway-station.svg \ - scalable_places_poi-town.svg \ - scalable_places_poi-school.svg \ - scalable_places_poi-place-of-worship.svg \ - scalable_places_poi-restaurant.svg \ - scalable_places_poi-bar.svg \ - scalable_places_poi-airport.svg \ - scalable_places_poi-light-rail-station.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -install-data-local: install-icons -uninstall-local: uninstall-icons - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache - -install-icons: - -for icon in $(public_icons); do \ - ICON=`echo $$icon | sed -e 's:_:/:g'`; \ - ICONDIR=`dirname $$ICON`; \ - mkdir -p $(DESTDIR)$(datadir)/icons/gnome/$$ICONDIR; \ - echo INSTALL $(DESTDIR)$(datadir)/icons/gnome/$$ICON; \ - $(INSTALL_DATA) $(srcdir)/maki/$$icon $(DESTDIR)$(datadir)/icons/gnome/$$ICON; \ - done; - -uninstall-icons: - -for icon in $(public_icons); do \ - ICON=`echo $$icon | sed -e 's:_:/:g'`; \ - echo rm -f $(DESTDIR)$(datadir)/icons/gnome/$$ICON; \ - rm -f $(DESTDIR)$(datadir)/icons/gnome/$$ICON; \ - done - -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/gnome; \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/gnome"; \ - fi - -EXTRA_DIST = $(addprefix maki/,$(public_icons)) - --include $(top_srcdir)/git.mk |