From b2e9bcd7d6b8f31a0307456c49acc20e103414b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Mon, 18 Feb 2019 16:25:43 +0100 Subject: Remove autotools-based build and all the related files --- .gitignore | 81 -------------- ChangeLog | 1 - MAINTAINTERS | 1 - Makefile.am | 31 ------ README | 1 - autogen.sh | 21 ---- build/Makefile.am | 4 - build/Makefile.am.enums | 43 -------- build/Makefile.am.marshal | 45 -------- champlain-gtk-uninstalled.pc.in | 11 -- champlain-gtk.pc.in | 11 -- champlain-gtk/Makefile.am | 92 ---------------- champlain-uninstalled.pc.in | 12 --- champlain.pc.in | 12 --- champlain/Makefile.am | 207 ------------------------------------ configure.ac | 227 ---------------------------------------- demos/Makefile.am | 62 ----------- demos/icons/Makefile.am | 1 - demos/memphis/Makefile.am | 1 - docs/Makefile.am | 3 - docs/reference/Makefile.am | 118 --------------------- m4/acinclude.m4 | 31 ------ m4/glib-2.0.m4 | 211 ------------------------------------- m4/gnome-common.m4 | 50 --------- m4/gnome-compiler-flags.m4 | 141 ------------------------- m4/introspection.m4 | 94 ----------------- make_dist.sh | 4 - 27 files changed, 1516 deletions(-) delete mode 100644 ChangeLog delete mode 100644 MAINTAINTERS delete mode 100644 Makefile.am delete mode 100644 README delete mode 100755 autogen.sh delete mode 100644 build/Makefile.am delete mode 100644 build/Makefile.am.enums delete mode 100644 build/Makefile.am.marshal delete mode 100644 champlain-gtk-uninstalled.pc.in delete mode 100644 champlain-gtk.pc.in delete mode 100644 champlain-gtk/Makefile.am delete mode 100644 champlain-uninstalled.pc.in delete mode 100644 champlain.pc.in delete mode 100644 champlain/Makefile.am delete mode 100644 configure.ac delete mode 100644 demos/Makefile.am delete mode 100644 demos/icons/Makefile.am delete mode 100644 demos/memphis/Makefile.am delete mode 100644 docs/Makefile.am delete mode 100644 docs/reference/Makefile.am delete mode 100644 m4/acinclude.m4 delete mode 100644 m4/glib-2.0.m4 delete mode 100644 m4/gnome-common.m4 delete mode 100644 m4/gnome-compiler-flags.m4 delete mode 100644 m4/introspection.m4 delete mode 100755 make_dist.sh diff --git a/.gitignore b/.gitignore index 179de25..b4f762c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,88 +1,7 @@ # prefix the meson build directory with _ to get it ignored _* -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -*.pc -.deps -.libs -*.o -*.lo -*.la -*.stamp -*.gir -*.vapi -*.typelib -*.gi *~ -*#* *.sw? *.pyc -champlain-gtk/champlain-gtk-marshal.c -champlain-gtk/champlain-gtk-marshal.h -champlain-gtk/stamp-marshal -champlain-gtk/champlain-gtk-enum-types.c -champlain-gtk/champlain-gtk-enum-types.h -champlain-gtk/stamp-enum-types -champlain/champlain-marshal.c -champlain/champlain-marshal.h -champlain/stamp-marshal -champlain/champlain-enum-types.c -champlain/champlain-enum-types.h -champlain/stamp-enum-types -champlain/champlain-version.h -champlain/champlain-features.h -compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -demos/animated-marker -demos/launcher -demos/launcher-gtk -demos/polygons -demos/url-marker -demos/local-rendering -demos/minimal -demos/minimal-gtk -demos/create-destroy-test -demos/launcher-vala -demos/launcher-vala.c -demos/markers-vala.c -depcomp -compile -docs/reference/version.xml -docs/reference/champlain-undeclared.txt -docs/reference/champlain-undocumented.txt -docs/reference/champlain-unused.txt -docs/reference/champlain.args -docs/reference/champlain.hierarchy -docs/reference/champlain.interfaces -docs/reference/champlain.prerequisites -docs/reference/champlain.signals -docs/reference/champlain-decl-list.txt -docs/reference/champlain-decl.txt -docs/reference/champlain-overrides.txt -docs/reference/champlain-types.txt -docs/reference/html/*.* -docs/reference/tmpl/*.* -docs/reference/xml/*.* -gtk-doc.make -install-sh -libtool -ltmain.sh -missing -stamp-h1 tags -INSTALL -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 -m4/gtk-doc.m4 diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 3a89dc9..0000000 --- a/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -Use 'git log' on the repo cloned from https://gitlab.gnome.org/GNOME/libchamplain diff --git a/MAINTAINTERS b/MAINTAINTERS deleted file mode 100644 index eb925ec..0000000 --- a/MAINTAINTERS +++ /dev/null @@ -1 +0,0 @@ -Jiří Techet diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index b41439a..0000000 --- a/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -SUBDIRS = build champlain - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -pcfiles = champlain-@CHAMPLAIN_API_VERSION@.pc -other_pcfiles = champlain-@CHAMPLAIN_API_VERSION@-uninstalled.pc - -if ENABLE_GTK -SUBDIRS += champlain-gtk -pcfiles += champlain-gtk-@CHAMPLAIN_API_VERSION@.pc -other_pcfiles += champlain-gtk-@CHAMPLAIN_API_VERSION@-uninstalled.pc -endif - -pkgconfig_DATA = $(pcfiles) -pkgconfigdir = $(libdir)/pkgconfig - -DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos --disable-memphis - -EXTRA_DIST = \ - README.md \ - champlain-gtk.pc.in \ - champlain-gtk-uninstalled.pc.in \ - champlain.pc.in \ - champlain-uninstalled.pc.in - -DISTCLEANFILES = $(pcfiles) $(other_pcfiles) - -all: $(other_pcfiles) - -# Have the demos build at the end as they depend on optional parts -SUBDIRS += docs demos diff --git a/README b/README deleted file mode 100644 index 96dc92f..0000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -See README.md diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index d5b7e7e..0000000 --- a/autogen.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="libchamplain" - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common module and make" - echo "sure the gnome-autogen.sh script is in your \$PATH." - exit 1 -} - -. gnome-autogen.sh diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index 8a230d9..0000000 --- a/build/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ - -EXTRA_DIST = \ - Makefile.am.marshal \ - Makefile.am.enums diff --git a/build/Makefile.am.enums b/build/Makefile.am.enums deleted file mode 100644 index 6948509..0000000 --- a/build/Makefile.am.enums +++ /dev/null @@ -1,43 +0,0 @@ -# Rules for generating enumeration types using glib-mkenums -# -# Define: -# glib_enum_h = header template file -# glib_enum_c = source template file -# glib_enum_headers = list of headers to parse -# -# before including Makefile.am.enums. You will also need to have -# the following targets already defined: -# -# CLEANFILES -# DISTCLEANFILES -# BUILT_SOURCES -# EXTRA_DIST -# -# Author: Emmanuele Bassi - -enum_tmpl_h=$(glib_enum_h:.h=.h.in) -enum_tmpl_c=$(glib_enum_c:.c=.c.in) - -CLEANFILES += stamp-enum-types -DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c) -BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c) -EXTRA_DIST += $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c) - -stamp-enum-types: $(glib_enum_headers) $(srcdir)/$(enum_tmpl_h) - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --template $(srcdir)/$(enum_tmpl_h) \ - $(glib_enum_headers) > xgen-eh \ - && (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \ - && rm -f xgen-eh \ - && echo timestamp > $(@F) - -$(glib_enum_h): stamp-enum-types - @true - -$(glib_enum_c): $(glib_enum_h) $(srcdir)/$(enum_tmpl_c) - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --template $(srcdir)/$(enum_tmpl_c) \ - $(glib_enum_headers) > xgen-ec \ - && cp -f xgen-ec $(glib_enum_c) \ - && rm -f xgen-ec - diff --git a/build/Makefile.am.marshal b/build/Makefile.am.marshal deleted file mode 100644 index f2b4996..0000000 --- a/build/Makefile.am.marshal +++ /dev/null @@ -1,45 +0,0 @@ -# Rules for generating marshal files using glib-genmarshal -# -# Define: -# glib_marshal_list = marshal list file -# glib_marshal_prefix = prefix for marshal functions -# -# before including Makefile.am.marshal. You will also need to have -# the following targets already defined: -# -# CLEANFILES -# DISTCLEANFILES -# BUILT_SOURCES -# EXTRA_DIST -# -# Author: Emmanuele Bassi - -marshal_h = $(glib_marshal_list:.list=.h) -marshal_c = $(glib_marshal_list:.list=.c) - -CLEANFILES += stamp-marshal -DISTCLEANFILES += $(marshal_h) $(marshal_c) -BUILT_SOURCES += $(marshal_h) $(marshal_c) -EXTRA_DIST += $(srcdir)/$(glib_marshal_list) - -stamp-marshal: $(glib_marshal_list) - $(AM_V_GEN)$(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --header \ - $(srcdir)/$(glib_marshal_list) > xgen-mh \ - && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \ - && rm -f xgen-mh \ - && echo timestamp > $(@F) - -$(marshal_h): stamp-marshal - @true - -$(marshal_c): $(marshal_h) - $(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \ - $(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --body \ - $(srcdir)/$(glib_marshal_list)) > xgen-mc \ - && cp xgen-mc $(marshal_c) \ - && rm -f xgen-mc - diff --git a/champlain-gtk-uninstalled.pc.in b/champlain-gtk-uninstalled.pc.in deleted file mode 100644 index 23e5011..0000000 --- a/champlain-gtk-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix= -exec_prefix= -abs_top_srcdir=@abs_top_srcdir@ -abs_top_builddir=@abs_top_builddir@ - -Name: libchamplain-gtk (uninstalled copy) -Description: Gtk+ Widget wrapper for libchamplain -Version: @VERSION@ -Libs: ${abs_top_builddir}/champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la -Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} -Requires: champlain-@CHAMPLAIN_API_VERSION@-uninstalled clutter-gtk-1.0 gtk+-3.0 diff --git a/champlain-gtk.pc.in b/champlain-gtk.pc.in deleted file mode 100644 index c9ac01f..0000000 --- a/champlain-gtk.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libchamplain-gtk -Description: Gtk+ Widget wrapper for libchamplain -Version: @VERSION@ -Libs: -L${libdir} -lchamplain-gtk-@CHAMPLAIN_API_VERSION@ -Cflags: -I${includedir}/libchamplain-gtk-@CHAMPLAIN_API_VERSION@ -Requires: clutter-gtk-1.0 champlain-@CHAMPLAIN_API_VERSION@ gtk+-3.0 diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am deleted file mode 100644 index c8742be..0000000 --- a/champlain-gtk/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -BUILT_SOURCES = -CLEANFILES = -DISTCLEANFILES = -EXTRA_DIST = - - -libchamplain_gtk_headers_public = \ - $(srcdir)/gtk-champlain-embed.h \ - $(srcdir)/champlain-gtk.h - -libchamplain_gtk_sources = \ - gtk-champlain-embed.c - -libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_SOURCES = \ - $(libchamplain_gtk_headers_public) \ - $(libchamplain_gtk_sources) - -libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \ - $(GTK_LIBS) \ - $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LDFLAGS= \ - -version-info $(LIBRARY_VERSION) \ - -no-undefined \ - -export-symbols-regex ^gtk_champlain_.* - -AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION - - -lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la - -libchamplain_gtkdir=$(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk - -libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public) - -# Make the g-ir-scanner to find the not yet installed pkg-config files. -PKG_CONFIG_PATH := $(top_builddir):$(PKG_CONFIG_PATH) - -if HAVE_INTROSPECTION - --include $(INTROSPECTION_MAKEFILE) - -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/champlain -INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/champlain - -introspection_sources = $(libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_SOURCES) - -GtkChamplain-@CHAMPLAIN_API_VERSION@.gir: libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 pangocairo -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-gtk-@CHAMPLAIN_API_VERSION@ -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = \ - --library-path=$(top_builddir)/champlain \ - --identifier-prefix=GtkChamplain \ - --symbol-prefix=gtk_champlain \ - --c-include="champlain-gtk/champlain-gtk.h" \ - --include-uninstalled=$(top_builddir)/champlain/Champlain-@CHAMPLAIN_API_VERSION@.gir -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \ - $(GTK_CFLAGS) $(DEPS_CFLAGS) \ - -I$(top_srcdir) -I$(top_builddir)\ - -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION - -INTROSPECTION_GIRS += GtkChamplain-@CHAMPLAIN_API_VERSION@.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 - - -if ENABLE_VALA - -vapidir = $(datadir)/vala/vapi -vapi_DATA = champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi - -CLEANFILES += $(vapi_DATA) - -champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi: GtkChamplain-@CHAMPLAIN_API_VERSION@.gir - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir ) - -endif - diff --git a/champlain-uninstalled.pc.in b/champlain-uninstalled.pc.in deleted file mode 100644 index 365d836..0000000 --- a/champlain-uninstalled.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix= -exec_prefix= -abs_top_srcdir=@abs_top_srcdir@ -abs_top_builddir=@abs_top_builddir@ - -Name: libchamplain (uninstalled copy) -Description: Map View for Clutter -Version: @VERSION@ -Libs: ${abs_top_builddir}/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la -Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} -Requires: gobject-2.0 glib-2.0 clutter-1.0 -Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4 diff --git a/champlain.pc.in b/champlain.pc.in deleted file mode 100644 index 6d847ce..0000000 --- a/champlain.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libchamplain -Description: Map View for Clutter -Version: @VERSION@ -Libs: -L${libdir} -lchamplain-@CHAMPLAIN_API_VERSION@ -Cflags: -I${includedir}/libchamplain-@CHAMPLAIN_API_VERSION@ -Requires: gobject-2.0 glib-2.0 clutter-1.0 -Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4 diff --git a/champlain/Makefile.am b/champlain/Makefile.am deleted file mode 100644 index 625a4f9..0000000 --- a/champlain/Makefile.am +++ /dev/null @@ -1,207 +0,0 @@ -BUILT_SOURCES = champlain-version.h -CLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = -EXTRA_DIST = champlain-version.h.in - - -if ENABLE_MEMPHIS -memphis_headers = \ - $(srcdir)/champlain-memphis-renderer.h -endif - -libchamplain_headers_public = \ - $(memphis_headers) \ - champlain-version.h \ - $(srcdir)/champlain.h \ - $(srcdir)/champlain-defines.h \ - $(srcdir)/champlain-point.h \ - $(srcdir)/champlain-custom-marker.h \ - $(srcdir)/champlain-view.h \ - $(srcdir)/champlain-layer.h \ - $(srcdir)/champlain-marker-layer.h \ - $(srcdir)/champlain-path-layer.h \ - $(srcdir)/champlain-location.h \ - $(srcdir)/champlain-coordinate.h \ - $(srcdir)/champlain-marker.h \ - $(srcdir)/champlain-label.h \ - $(srcdir)/champlain-scale.h \ - $(srcdir)/champlain-license.h \ - $(srcdir)/champlain-tile.h \ - $(srcdir)/champlain-map-source.h \ - $(srcdir)/champlain-map-source-chain.h \ - $(srcdir)/champlain-tile-source.h \ - $(srcdir)/champlain-tile-cache.h \ - $(srcdir)/champlain-memory-cache.h \ - $(srcdir)/champlain-network-tile-source.h \ - $(srcdir)/champlain-file-cache.h \ - $(srcdir)/champlain-map-source-factory.h \ - $(srcdir)/champlain-map-source-desc.h \ - $(srcdir)/champlain-renderer.h \ - $(srcdir)/champlain-image-renderer.h \ - $(srcdir)/champlain-error-tile-renderer.h \ - $(srcdir)/champlain-file-tile-source.h \ - $(srcdir)/champlain-null-tile-source.h \ - $(srcdir)/champlain-network-bbox-tile-source.h \ - $(srcdir)/champlain-adjustment.h \ - $(srcdir)/champlain-kinetic-scroll-view.h \ - $(srcdir)/champlain-viewport.h \ - $(srcdir)/champlain-bounding-box.h \ - $(srcdir)/champlain-exportable.h - - -libchamplain_headers_private = \ - $(srcdir)/champlain-debug.h \ - $(srcdir)/champlain-private.h - - -if ENABLE_MEMPHIS -memphis_sources = \ - champlain-memphis-renderer.c -endif - -libchamplain_sources = \ - $(memphis_sources) \ - champlain-debug.c \ - champlain-view.c \ - champlain-layer.c \ - champlain-marker-layer.c \ - champlain-path-layer.c \ - champlain-location.c \ - champlain-coordinate.c \ - champlain-marker.c \ - champlain-label.c \ - champlain-scale.c \ - champlain-license.c \ - champlain-tile.c \ - champlain-map-source.c \ - champlain-map-source-chain.c \ - champlain-tile-source.c \ - champlain-tile-cache.c \ - champlain-memory-cache.c \ - champlain-network-tile-source.c \ - champlain-file-cache.c \ - champlain-map-source-factory.c \ - champlain-map-source-desc.c \ - champlain-point.c \ - champlain-custom-marker.c \ - champlain-renderer.c \ - champlain-image-renderer.c \ - champlain-error-tile-renderer.c \ - champlain-file-tile-source.c \ - champlain-null-tile-source.c \ - champlain-network-bbox-tile-source.c \ - champlain-adjustment.c \ - champlain-kinetic-scroll-view.c \ - champlain-viewport.c \ - champlain-bounding-box.c \ - champlain-exportable.c - -champlain-features.h: $(top_builddir)/config.status - $(AM_V_GEN) ( cd $(top_builddir) && ./config.status champlain/$@ ) - -BUILT_SOURCES += champlain-features.h -CLEANFILES += champlain-features.h - -# glib-mkenums rules -glib_enum_h = champlain-enum-types.h -glib_enum_c = champlain-enum-types.c -glib_enum_headers = $(filter-out champlain-version.h,$(libchamplain_headers_public)) -include $(top_srcdir)/build/Makefile.am.enums - -libchamplain_headers_built = \ - champlain-features.h \ - champlain-enum-types.h - -libchamplain_sources_built = \ - champlain-enum-types.c - - -libchamplain_@CHAMPLAIN_API_VERSION@_la_SOURCES = \ - $(libchamplain_headers_public) \ - $(libchamplain_headers_private) \ - $(libchamplain_sources) - -nodist_libchamplain_@CHAMPLAIN_API_VERSION@_la_SOURCES = \ - $(libchamplain_headers_built) \ - $(libchamplain_sources_built) - -libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(MEMPHIS_LIBS) $(LIBM) - -libchamplain_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \ - -version-info $(LIBRARY_VERSION)\ - -no-undefined \ - -export-symbols-regex ^champlain_.* - -AM_CPPFLAGS = \ - $(DEPS_CFLAGS) \ - $(MEMPHIS_CFLAGS) \ - -DDATADIR=\""$(datadir)"\" \ - -I$(top_srcdir) \ - -DCHAMPLAIN_COMPILATION \ - -DG_LOG_DOMAIN=\"$(PACKAGE_NAME)\" \ - $(WARN_CFLAGS) - - -lib_LTLIBRARIES = libchamplain-@CHAMPLAIN_API_VERSION@.la - -libchamplaindir = $(includedir)/libchamplain-@CHAMPLAIN_API_VERSION@/champlain - -libchamplain_HEADERS = $(libchamplain_headers_public) - -nodist_libchamplain_HEADERS = $(libchamplain_headers_built) - - -if HAVE_INTROSPECTION - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all -INTROSPECTION_COMPILER_ARGS = -introspection_sources = \ - $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public)) \ - champlain-enum-types.h \ - $(libchamplain_sources) -if ENABLE_MEMPHIS -memphis_gir_include = Memphis-0.2 -memphis_package = champlain-memphis-@CHAMPLAIN_API_VERSION@ -endif - -Champlain-@CHAMPLAIN_API_VERSION@.gir: libchamplain-@CHAMPLAIN_API_VERSION@.la -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = Champlain -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-@CHAMPLAIN_API_VERSION@.la -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 cogl-pango-1.0 -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 $(memphis_gir_include) -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package) -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --identifier-prefix=Champlain --symbol-prefix=champlain --c-include="champlain/champlain.h" -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \ - $(DEPS_CFLAGS) $(MEMPHIS_CFLAGS) \ - -I$(top_srcdir) -I$(top_builddir) \ - -DCHAMPLAIN_COMPILATION - -INTROSPECTION_GIRS += Champlain-@CHAMPLAIN_API_VERSION@.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 - - -if ENABLE_VALA - -vapidir = $(datadir)/vala/vapi -vapi_DATA = champlain-@CHAMPLAIN_API_VERSION@.vapi - -CLEANFILES += $(vapi_DATA) - -champlain-@CHAMPLAIN_API_VERSION@.vapi: Champlain-@CHAMPLAIN_API_VERSION@.gir - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir ) - -endif - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index dfbca54..0000000 --- a/configure.ac +++ /dev/null @@ -1,227 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. -m4_define([champlain_major_version], [0]) -m4_define([champlain_minor_version], [12]) -m4_define([champlain_micro_version], [20]) -m4_define([champlain_version], - [champlain_major_version.champlain_minor_version.champlain_micro_version]) -m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)]) -m4_define([champlain_api_version], - [champlain_major_version.champlain_minor_api_version]) -AC_PREREQ([2.64]) -AC_INIT([libchamplain], - [champlain_version], - [https://gitlab.gnome.org/GNOME/libchamplain/issues], - [libchamplain], - [https://wiki.gnome.org/Projects/libchamplain]) -AC_CONFIG_SRCDIR([champlain/champlain.h]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz]) - -LT_PREREQ([2.2.6]) -LT_INIT([dlopen]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -# Checks for programs. -AC_PROG_CC -AM_PROG_CC_C_O - -# Before making a release, the LIBRARY_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 -LIBRARY_VERSION=11:9:11 -CHAMPLAIN_API_VERSION=champlain_api_version -CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version -CHAMPLAIN_MAJOR_VERSION=champlain_major_version -CHAMPLAIN_MINOR_VERSION=champlain_minor_version -CHAMPLAIN_MICRO_VERSION=champlain_micro_version -CHAMPLAIN_VERSION=champlain_version -CHAMPLAIN_MAJORMINOR=champlain_api_version -AC_SUBST(CHAMPLAIN_API_VERSION) -AC_SUBST(CHAMPLAIN_API_VERSION_NORM) -AC_SUBST(CHAMPLAIN_MAJOR_VERSION) -AC_SUBST(CHAMPLAIN_MINOR_VERSION) -AC_SUBST(CHAMPLAIN_MICRO_VERSION) -AC_SUBST(CHAMPLAIN_VERSION) -AC_SUBST(CHAMPLAIN_MAJORMINOR) - -AC_SUBST(LIBRARY_VERSION) - -# Checks for libraries. - -AC_CHECK_LIBM -AC_SUBST(LIBM) - -PKG_CHECK_MODULES(DEPS, - [ glib-2.0 >= 2.38 - gobject-2.0 >= 2.38 - gio-2.0 >= 2.38 - gdk-3.0 >= 3.0 - clutter-1.0 >= 1.24 - cairo >= 1.4 - sqlite3 >= 3.0 - libsoup-2.4 >= 2.42 - ] -) -AC_SUBST(DEPS_CFLAGS) -AC_SUBST(DEPS_LIBS) - -AM_PATH_GLIB_2_0(2.38.0,,gobject gthread gio) - -# check for gtk-doc -GTK_DOC_CHECK(1.15) - -GNOME_COMPILE_WARNINGS([maximum]) -GNOME_MAINTAINER_MODE_DEFINES - -GOBJECT_INTROSPECTION_CHECK([0.6.3]) - -# ----------------------------------------------------------- -# Enable debug -# ----------------------------------------------------------- - -AC_ARG_ENABLE(debug, - AS_HELP_STRING([--disable-debug],[compile without debug code]), - enable_debug=$enableval, enable_debug=yes ) - -if test x$enable_debug = xyes; then - AC_DEFINE(ENABLE_DEBUG, [], [Enable debug code]) -fi - -# ----------------------------------------------------------- -# Enable gtk -# ----------------------------------------------------------- - -AC_ARG_ENABLE(gtk, - AS_HELP_STRING([--disable-gtk],[Do not compile Gtk+ embedded view]), - enable_gtk=$enableval, enable_gtk=yes ) - -if test x$enable_gtk = xyes; then - PKG_CHECK_MODULES(GTK, - [ gtk+-3.0 >= 3.0 - clutter-gtk-1.0 >= 1.0 - ] - ) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -fi - -AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes") - -# ----------------------------------------------------------- -# Enable memphis -# ----------------------------------------------------------- - -AC_ARG_ENABLE(memphis, - AS_HELP_STRING([--disable-memphis],[Disable support of local rendering using libmemphis]), - enable_memphis=$enableval, enable_memphis=no) - -if test "x$enable_memphis" = "xyes"; then - PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1]) -fi - -AC_SUBST(MEMPHIS_CFLAGS) -AC_SUBST(MEMPHIS_LIBS) - -AM_CONDITIONAL(ENABLE_MEMPHIS, test "x$enable_memphis" = "xyes") - -# ----------------------------------------------------------- -# Enable vala bindings (default to "no") -# ----------------------------------------------------------- - -AC_ARG_ENABLE(vala, - AS_HELP_STRING([--enable-vala], [Build Vala bindings [default=no]]), - enable_vala=$enableval, enable_vala=no ) - -if test "x$enable_vala" = "xyes"; then - if test "x$enable_introspection" = "xno"; then - AC_MSG_ERROR([Cannot build vala bindings without gobject introspection]) - fi - - AC_PATH_PROG(VAPIGEN, vapigen, vapigen) - AC_SUBST(VAPIGEN) -fi - -AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" = "xyes") - -# ----------------------------------------------------------- -# Enable vala demos (default to "no") -# ----------------------------------------------------------- - -AC_ARG_ENABLE(vala-demos, - AS_HELP_STRING([--enable-vala-demos],[Build vala demos [default=no]]), - enable_vala_demos=$enableval, enable_vala_demos=no ) - -if test "x$enable_vala_demos" = "xyes"; then - AM_PROG_VALAC([0.11.0]) - - if test "x$VALAC" = "x" ; then - AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH]) - fi -fi - -AM_CONDITIONAL(ENABLE_VALA_DEMOS, test "x$enable_vala_demos" = "xyes") - -# ----------------------------------------------------------- -# Generate features header file -# ----------------------------------------------------------- - -CHAMPLAIN_CONFIG_COMMANDS([champlain/champlain-features.h], -[ - echo '/* Generated by configure. Do not edit. */' - echo '#ifndef CHAMPLAIN_FEATURES_H' - echo '#define CHAMPLAIN_FEATURES_H' - echo '' - if test "x$enable_memphis" = "xyes"; then - echo '#define CHAMPLAIN_HAS_MEMPHIS 1' - echo '' - fi - echo '#endif' -],[ - enable_memphis="$enable_memphis" -]) - -# ---------------------------------------------------------- - -AC_CONFIG_FILES([Makefile - build/Makefile - champlain/Makefile - champlain/champlain-version.h - demos/Makefile - demos/icons/Makefile - demos/memphis/Makefile - docs/Makefile - docs/reference/Makefile - docs/reference/version.xml - champlain-$CHAMPLAIN_API_VERSION.pc:champlain.pc.in - champlain-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-uninstalled.pc.in - champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in - champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in - champlain-gtk/Makefile]) -AC_OUTPUT - -echo "" -echo "libchamplain $VERSION" -echo "" -echo " Prefix: ${prefix}" -echo " Compiler flags: ${CFLAGS} ${CPPFLAGS}" -echo " Documentation: ${enable_gtk_doc}" -echo " Debug: ${enable_debug}" -echo " Gtk+ View: ${enable_gtk}" -echo "" -echo "Extra renderers:" -echo " Memphis renderer: ${enable_memphis}" -echo "" -echo "Bindings:" -echo " gobject-introspection: ${enable_introspection}" -echo " Vala vapi generation: ${enable_vala}" -echo " Vala demos: ${enable_vala_demos}" -echo "" - diff --git a/demos/Makefile.am b/demos/Makefile.am deleted file mode 100644 index 496dffd..0000000 --- a/demos/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -noinst_PROGRAMS = minimal launcher animated-marker polygons url-marker create-destroy-test - -SUBDIRS = icons memphis - -AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) - -minimal_SOURCES = minimal.c -minimal_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -launcher_SOURCES = launcher.c markers.c -launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -animated_marker_SOURCES = animated-marker.c -animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -polygons_SOURCES = polygons.c -polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -url_marker_SOURCES = url-marker.c -url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -create_destroy_test_SOURCES = create-destroy-test.c -create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -if ENABLE_GTK -noinst_PROGRAMS += minimal-gtk -minimal_gtk_SOURCES = minimal-gtk.c -minimal_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -minimal_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \ - ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \ - ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -noinst_PROGRAMS += launcher-gtk -launcher_gtk_SOURCES = launcher-gtk.c markers.c -launcher_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -launcher_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \ - ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \ - ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la - -if ENABLE_MEMPHIS -noinst_PROGRAMS += local-rendering -local_rendering_SOURCES = local-rendering.c -local_rendering_CPPFLAGS = $(GTK_CFLAGS) $(MEMPHIS_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -local_rendering_LDADD = $(GTK_LIBS) $(MEMPHIS_LIBS) $(DEPS_LIBS) \ - ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \ - ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la -endif -endif - -if ENABLE_VALA_DEMOS -noinst_PROGRAMS += launcher-vala -launcher_vala_SOURCES = launcher-vala.vala markers-vala.vala -AM_VALAFLAGS = \ - --vapidir=../champlain \ - --pkg atk --pkg clutter-1.0 --pkg champlain-@CHAMPLAIN_API_VERSION@ -launcher_vala_LDADD = \ - $(DEPS_LIBS) \ - $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la -endif - -EXTRA_DIST = markers.h launcher.js minimal.py launcher-gtk.py polygons.py keyboard-mapping.py mapbox.py - diff --git a/demos/icons/Makefile.am b/demos/icons/Makefile.am deleted file mode 100644 index 7dda561..0000000 --- a/demos/icons/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = emblem-favorite.png emblem-generic.png emblem-important.png emblem-new.png diff --git a/demos/memphis/Makefile.am b/demos/memphis/Makefile.am deleted file mode 100644 index 73cc545..0000000 --- a/demos/memphis/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index c31b80f..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -if ENABLE_GTK - SUBDIRS=reference -endif diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am deleted file mode 100644 index fd2d653..0000000 --- a/docs/reference/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module, e.g. 'glib'. -DOC_MODULE=champlain - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -DOC_MODULE_VERSION=@CHAMPLAIN_API_VERSION@ - - -# 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=\ - ../../champlain \ - ../../champlain-gtk - -# 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-types --deprecated-guards="GTK_DISABLE_DEPRECATED" - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=champlain --name-space=gtk_champlain - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_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= - -# 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)/champlain/*.h $(top_srcdir)/champlain-gtk/*.h -CFILE_GLOB=$(top_srcdir)/champlain/*.c $(top_srcdir)/champlain-gtk/*.c - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= - -if ENABLE_MEMPHIS -memphis_headers= -else -memphis_headers=champlain-memphis-renderer.h -endif - -# Header files to ignore when scanning. Use base file name, no paths -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=\ - champlain-gtk.h \ - $(memphis_headers) \ - champlain-debug.h \ - champlain-enum-types.h \ - champlain-private.h \ - champlain.h \ - champlain-defines.h \ - champlain-features.h \ - champlain-adjustment.h \ - champlain-kinetic-scroll-view.h \ - champlain-viewport.h - -# 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. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -GTKDOC_LIBS=$(DEPS_LIBS) \ - $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la\ - $(top_builddir)/champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.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 += - -# Files not to distribute -# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt -#DISTCLEANFILES += - -# Comment this out if you want your docs-status tested during 'make check' -if ENABLE_GTK_DOC -#TESTS_ENVIRONMENT = cd $(srcsrc) && -#TESTS = $(GTKDOC_CHECK) -endif - --include $(top_srcdir)/git.mk diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 deleted file mode 100644 index 3bd4555..0000000 --- a/m4/acinclude.m4 +++ /dev/null @@ -1,31 +0,0 @@ - -dnl CHAMPLAIN_CONFIG_COMMANDS is like AC_CONFIG_COMMANDS, except that: -dnl -dnl 1) It redirects the stdout of the command to the file. -dnl 2) It does not recreate the file if contents did not change. -dnl -dnl (macro copied from CAIRO) - -AC_DEFUN([CHAMPLAIN_CONFIG_COMMANDS], -[dnl - AC_CONFIG_COMMANDS($1, - [ - _config_file=$1 - _tmp_file=champlainconf.tmp - AC_MSG_NOTICE([creating $_config_file]) - { - $2 - } >> "$_tmp_file" || - AC_MSG_ERROR([failed to write to $_tmp_file]) - - if cmp -s "$_tmp_file" "$_config_file"; then - AC_MSG_NOTICE([$_config_file is unchanged]) - rm -f "$_tmp_file" - else - mv "$_tmp_file" "$_config_file" || - AC_MSG_ERROR([failed to update $_config_file]) - fi - ], $3) -]) - - diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4 deleted file mode 100644 index a13eeec..0000000 --- a/m4/glib-2.0.m4 +++ /dev/null @@ -1,211 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - fclose (fopen ("conf.glibtest", "w")); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - rm -f conf.glibtest -]) diff --git a/m4/gnome-common.m4 b/m4/gnome-common.m4 deleted file mode 100644 index a5a0ead..0000000 --- a/m4/gnome-common.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# gnome-common.m4 -# - -dnl GNOME_COMMON_INIT - -AC_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) - - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - - AC_SUBST([ACLOCAL_AMFLAGS]) -]) - -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) - - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - AC_SUBST(DISABLE_DEPRECATED) -]) diff --git a/m4/gnome-compiler-flags.m4 b/m4/gnome-compiler-flags.m4 deleted file mode 100644 index b9db2fd..0000000 --- a/m4/gnome-compiler-flags.m4 +++ /dev/null @@ -1,141 +0,0 @@ -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) - - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) diff --git a/m4/introspection.m4 b/m4/introspection.m4 deleted file mode 100644 index 589721c..0000000 --- a/m4/introspection.m4 +++ /dev/null @@ -1,94 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff --git a/make_dist.sh b/make_dist.sh deleted file mode 100755 index 4c7e054..0000000 --- a/make_dist.sh +++ /dev/null @@ -1,4 +0,0 @@ -./autogen.sh --enable-gtk --disable-memphis --enable-gtk-doc --enable-introspection --enable-vala --enable-vala-demos -make -j4 -make distcheck - -- cgit v1.2.1