diff options
author | Victor Toso <me@victortoso.com> | 2018-07-29 14:57:19 +0200 |
---|---|---|
committer | Victor Toso <me@victortoso.com> | 2018-07-30 14:20:45 +0200 |
commit | ff36ce1bbda4f71578a3fc003684ac9b2914d639 (patch) | |
tree | b47b66cc02108907e7c6d7efdc757d15a55f35c0 | |
parent | 6f7cf1e9d1689e3c066a0e8faf05fa0c4896d101 (diff) | |
download | grilo-ff36ce1bbda4f71578a3fc003684ac9b2914d639.tar.gz |
build: Remove autotools support
-rw-r--r-- | ChangeLog | 0 | ||||
-rw-r--r-- | Makefile.am | 58 | ||||
-rwxr-xr-x | autogen.sh | 23 | ||||
-rw-r--r-- | bindings/Makefile.am | 3 | ||||
-rw-r--r-- | bindings/vala/Makefile.am | 33 | ||||
-rw-r--r-- | configure.ac | 332 | ||||
-rw-r--r-- | doc/Makefile.am | 14 | ||||
-rw-r--r-- | doc/grilo/Makefile.am | 129 | ||||
-rw-r--r-- | doc/man/Makefile.am | 14 | ||||
-rw-r--r-- | examples/Makefile.am | 25 | ||||
-rw-r--r-- | git.mk | 303 | ||||
-rw-r--r-- | libs/Makefile.am | 20 | ||||
-rw-r--r-- | libs/net/Makefile.am | 78 | ||||
-rw-r--r-- | libs/pls/Makefile.am | 74 | ||||
-rw-r--r-- | m4/introspection.m4 | 94 | ||||
-rw-r--r-- | m4/vapigen.m4 | 101 | ||||
-rw-r--r-- | release.mk | 48 | ||||
-rw-r--r-- | src/Makefile.am | 153 | ||||
-rw-r--r-- | src/data/Makefile.am | 1 | ||||
-rw-r--r-- | tests/Makefile.am | 81 | ||||
-rw-r--r-- | tests/python/Makefile.am | 25 | ||||
-rw-r--r-- | tools/Makefile.am | 16 | ||||
-rw-r--r-- | tools/grilo-inspect/Makefile.am | 35 | ||||
-rw-r--r-- | tools/grilo-launch/Makefile.am | 24 | ||||
-rw-r--r-- | tools/grilo-test-ui/Makefile.am | 41 |
25 files changed, 0 insertions, 1725 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/ChangeLog +++ /dev/null diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 21b87bb..0000000 --- a/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# -# Makefile.am -# -# Author: Iago Toral Quiroga <itoral@igalia.com> -# -# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved. - -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = src libs bindings po tools doc examples - -if ENABLE_TESTS -SUBDIRS += tests -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = grilo-0.3.pc - -if BUILD_GRILO_NET -pkgconfig_DATA += grilo-net-0.3.pc -endif - -if BUILD_GRILO_PLS -pkgconfig_DATA += grilo-pls-0.3.pc -endif - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(srcdir)/gtk-doc.make \ - $(srcdir)/m4/gtk-doc.m4 \ - $(srcdir)/m4/intltool.m4 \ - $(srcdir)/omf.make \ - $(srcdir)/xmldocs.make - -DISTCLEANFILES = $(MAINTAINERCLEANFILES) - -EXTRA_DIST = \ - $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/grilo-*" ) \ - meson_options.txt \ - ./m4/introspection.m4 - -DISTCHECK_CONFIGURE_FLAGS= \ - --enable-grl-net \ - --enable-grl-pls \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-test-ui \ - --enable-vala - -distclean-local: - -rm -rf autom4te.cache - -dist-hook: - --include $(top_srcdir)/git.mk --include $(top_srcdir)/release.mk diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 4fdb039..0000000 --- a/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="grilo" - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} - -REQUIRED_AUTOMAKE_VERSION=1.10 \ -USE_GNOME2_MACROS=1 \ -USE_COMMON_DOC_BUILD=yes \ -. gnome-autogen.sh "$@" diff --git a/bindings/Makefile.am b/bindings/Makefile.am deleted file mode 100644 index 86de8f0..0000000 --- a/bindings/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = vala - --include $(top_srcdir)/git.mk diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am deleted file mode 100644 index 2176f1b..0000000 --- a/bindings/vala/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -EXTRA_DIST = -CLEANFILES = - -VAPIGEN_VAPIS = grilo-@GRL_MAJORMINOR@.vapi grilo-net-@GRL_MAJORMINOR@.vapi - -if ENABLE_VAPIGEN --include $(VAPIGEN_MAKEFILE) - -grilo-@GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir grilo-@GRL_MAJORMINOR@-custom.vala grilo-@GRL_MAJORMINOR@.deps Grl-@GRL_MAJORMINOR@.metadata - -grilo_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 -grilo_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) -grilo_@GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir - -if BUILD_GRILO_NET -grilo-net-@GRL_MAJORMINOR@.vapi: $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir grilo-net-@GRL_MAJORMINOR@-custom.vala grilo-net-@GRL_MAJORMINOR@.deps GrlNet-@GRL_MAJORMINOR@.metadata - -grilo_net_@GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0 -grilo_net_@GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir) -grilo_net_@GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-net-@GRL_MAJORMINOR@-custom.vala $(top_builddir)/libs/net/GrlNet-@GRL_MAJORMINOR@.gir -endif - -vapidir = $(datadir)/vala/vapi -vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) - -endif - -EXTRA_DIST += Grl-@GRL_MAJORMINOR@.metadata grilo-@GRL_MAJORMINOR@.deps grilo-@GRL_MAJORMINOR@-custom.vala -EXTRA_DIST += GrlNet-@GRL_MAJORMINOR@.metadata grilo-net-@GRL_MAJORMINOR@.deps grilo-net-@GRL_MAJORMINOR@-custom.vala - -CLEANFILES += $(VAPIGEN_VAPIS) - --include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 92c330d..0000000 --- a/configure.ac +++ /dev/null @@ -1,332 +0,0 @@ -# -# configure.ac -# -# Author: Iago Toral Quiroga <itoral@igalia.com> -# -# Copyright (C) 2010, 2011 Igalia S.L.. All rights reserved. - -m4_define([prj_name], [grilo]) -m4_define([prj_gir_name], [Grilo]) -m4_define([grl_major_version], [0]) -m4_define([grl_minor_version], [3]) -m4_define([grl_micro_version], [7]) -m4_define([prj_version], grl_major_version.grl_minor_version.grl_micro_version) - -AC_INIT([prj_name], - [prj_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core], - [prj_name], - [https://wiki.gnome.org/Projects/Grilo]) - -AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/grilo.h]) - -AC_CONFIG_HEADERS([config.h]) - -AC_PROG_AWK -AC_PROG_CC -AC_PROG_INSTALL - -LT_PREREQ([2.2.6]) -LT_INIT - -AM_PROG_CC_C_O - -AC_HEADER_STDC - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Grilo Net library - -GRLNET_VERSION=grl_major_version.grl_minor_version.grl_micro_version -AC_SUBST(GRLNET_VERSION) -AC_DEFINE_UNQUOTED(GRLNET_VERSION, "$GRLNET_VERSION", [Grilo Net library version]) - -# Grilo Pls library - -GRLPLS_VERSION=grl_major_version.grl_minor_version.grl_micro_version -AC_SUBST(GRLPLS_VERSION) -AC_DEFINE_UNQUOTED(GRLPLS_VERSION, "$GRLPLS_VERSION", [Grilo Pls library version]) - -# ---------------------------------------------------------- -# LIBTOOL VERSIONING -# ---------------------------------------------------------- - -# Libtool library version, not to confuse with API version -# see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - -GRL_LT_VERSION=2:0:2 -GRLNET_LT_VERSION=0:5:0 -GRLPLS_LT_VERSION=0:0:0 - -AC_SUBST([GRL_LT_VERSION]) -AC_SUBST([GRLNET_LT_VERSION]) -AC_SUBST([GRLPLS_LT_VERSION]) - -# ---------------------------------------------------------- -# ENVIRONMENT CONFIGURATION -# ---------------------------------------------------------- - -GNOME_COMPILE_WARNINGS([maximum]) -CFLAGS+=" ${WARN_CFLAGS} -Wmissing-declarations -std=c99 " - -GNOME_MAINTAINER_MODE_DEFINES - -# ---------------------------------------------------------- -# DEFINITIONS -# ---------------------------------------------------------- - -# API version - -GRL_MAJORMINOR=grl_major_version.grl_minor_version -GRL_MAJORMINOR_NORM=grl_major_version[_]grl_minor_version -AC_SUBST(GRL_MAJORMINOR) -AC_SUBST(GRL_MAJORMINOR_NORM) -AC_DEFINE_UNQUOTED(GRL_MAJORMINOR, "$GRL_MAJORMINOR", [library major.minor version]) - -# Framework name (contains API version) - -GRL_NAME="${PACKAGE_NAME}-${GRL_MAJORMINOR}" -AC_SUBST(GRL_NAME) -AC_DEFINE_UNQUOTED(GRL_NAME, "$GRL_NAME", [framework name]) - -# Give parameters a default value - -if test "x${prefix}" = "xNONE" ; then - prefix="${ac_default_prefix}" -fi - -if test "x${exec_prefix}" = "xNONE" ; then - exec_prefix="${prefix}" -fi - -# Plugins directory - -GRL_PLUGINS_DIR=`eval echo ${libdir}/${GRL_NAME}` -AC_SUBST(GRL_PLUGINS_DIR) -AC_DEFINE_UNQUOTED(GRL_PLUGINS_DIR, "$GRL_PLUGINS_DIR", [Plugins directory]) - -# ---------------------------------------------------------- -# DEPENDENCIES -# ---------------------------------------------------------- - -GLIB2_REQUIRED=2.44 - -PKG_CHECK_MODULES(DEPS, glib-2.0 >= $GLIB2_REQUIRED \ - gobject-2.0 >= $GLIB2_REQUIRED \ - gmodule-2.0 >= $GLIB2_REQUIRED \ - gio-2.0 >= $GLIB2_REQUIRED \ - libxml-2.0) - - -GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0` -AC_SUBST(GLIB_GENMARSHAL) -AC_SUBST(GLIB_MKENUMS) - -# ---------------------------------------------------------- -# UI Tool -# ---------------------------------------------------------- - -PKG_CHECK_MODULES([GTU], [ gtk+-3.0 >= 3.0 ], - [ HAVE_GTK=yes ], - [ HAVE_GTK=no ]) - -PKG_CHECK_MODULES(OAUTH, oauth, [HAVE_OAUTH=yes], [HAVE_OAUTH=no]) - -AM_CONDITIONAL(HAVE_OAUTH, test "x$HAVE_OAUTH" = "xyes") - -if test "x$HAVE_OAUTH" = "xyes"; then - AC_DEFINE(HAVE_OAUTH, 1, [OAuth available]) -else - AC_MSG_WARN([oauth missing, unable to configure Flickr personal accounts]) -fi - -AC_ARG_ENABLE(test-ui, - AS_HELP_STRING([--enable-test-ui], - [Build Test UI (default: auto)]), - [ - case "$enableval" in - yes) - if test "x$HAVE_GTK" = "xno"; then - AC_MSG_ERROR([gtk+-3.0 >= 3.0 not found, install it or use --disable-test-ui]) - fi - ;; - no) - HAVE_GTK=no - ;; - esac - ]) - -AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$HAVE_GTK" = "xyes") - -# ---------------------------------------------------------- -# NET LIBRARY -# ---------------------------------------------------------- - -PKG_CHECK_MODULES(NET, libsoup-2.4 >= 2.41.3, - HAVE_LIBSOUP=yes, - HAVE_LIBSOUP=no) - -AC_ARG_ENABLE([grl_net], - AS_HELP_STRING([--enable-grl-net], - [Enable Grilo Net library (default: auto)]), - [ - case "$enableval" in - yes | auto) - if test "x$HAVE_LIBSOUP" = "xno"; then - AC_MSG_ERROR([libsoup-2.4 not found, install it or use --disable-grl-net]) - fi - ;; - no) - HAVE_LIBSOUP=no - ;; - esac - ]) - -AM_CONDITIONAL(BUILD_GRILO_NET, test "x$HAVE_LIBSOUP" = "xyes") - -# ---------------------------------------------------------- -# PLS LIBRARY -# ---------------------------------------------------------- - -PKG_CHECK_MODULES(TOTEM_PL_PARSER, totem-plparser >= 3.4.1, HAVE_TOTEM_PL_PARSER=yes, HAVE_TOTEM_PL_PARSER=no) - -AC_ARG_ENABLE([grl_pls], - AS_HELP_STRING([--enable-grl-pls], - [Enable Grilo Pls library (default: auto)]), - [ - case "$enableval" in - yes | auto) - if test "x$HAVE_TOTEM_PL_PARSER" = "xno"; then - AC_MSG_ERROR([totem-pl-parser not found, install it or use --disable-grl-pls]) - fi - ;; - no) - HAVE_TOTEM_PL_PARSER=no - ;; - esac - ]) - -AM_CONDITIONAL(BUILD_GRILO_PLS, test "x$HAVE_TOTEM_PL_PARSER" = "xyes") - -# ---------------------------------------------------------- -# DEBUG SUPPORT -# ---------------------------------------------------------- - -AC_ARG_ENABLE(debug, - [ --enable-debug include debug symbols],, - enable_debug=yes) -if test "x$enable_debug" = "xyes"; then - AC_MSG_WARN("Configuring with debugging options enabled!") - CFLAGS="$CFLAGS -g3 -O0" -fi - -# ---------------------------------------------------------- -# TESTS SUPPORT -# ---------------------------------------------------------- - -AC_ARG_ENABLE([tests], - AS_HELP_STRING([--enable-tests],[build unit tests]), - enable_tests=yes, - enable_tests=no) - -AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes") - -# ---------------------------------------------------------- -# GTK-DOC -# ---------------------------------------------------------- - -GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) - -# ---------------------------------------------------------- -# GOBJECT-INTROSPECTION -# ---------------------------------------------------------- - -GOBJECT_INTROSPECTION_CHECK([0.9]) - -# ---------------------------------------------------------- -# VALA BINDINGS -# ---------------------------------------------------------- - -VAPIGEN_CHECK([0.27]) - -# ---------------------------------------------------------- -# GETTEXT/INTLTOOL -# ---------------------------------------------------------- - -IT_PROG_INTLTOOL([0.40.0]) -GETTEXT_PACKAGE=grilo -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The domain to use with gettext]) - -# ---------------------------------------------------------- -# WORKAROUNDS -# ---------------------------------------------------------- - -AC_SUBST([abs_top_builddir]) -AC_SUBST([builddir]) - -# ---------------------------------------------------------- -# OUTPUT -# ---------------------------------------------------------- - -if test "x$HAVE_LIBSOUP" = "xyes"; then - AC_CONFIG_FILES([grilo-net-uninstalled.pc grilo-net-${GRL_MAJORMINOR}.pc]) -fi - -if test "x$HAVE_TOTEM_PL_PARSER" = "xyes"; then - AC_CONFIG_FILES([grilo-pls-uninstalled.pc grilo-pls-${GRL_MAJORMINOR}.pc]) -fi - -AC_CONFIG_FILES([ - Makefile - grilo-uninstalled.pc - grilo-${GRL_MAJORMINOR}.pc - src/Makefile - src/data/Makefile - po/Makefile.in - po/Makefile - tests/Makefile - tests/python/Makefile - tests/python/util.py - libs/Makefile - libs/net/Makefile - libs/pls/Makefile - tools/Makefile - tools/grilo-test-ui/Makefile - tools/grilo-inspect/Makefile - tools/grilo-launch/Makefile - bindings/Makefile - bindings/vala/Makefile - doc/Makefile - doc/grilo/Makefile - doc/man/Makefile - examples/Makefile -]) - -AC_OUTPUT - -echo " - -Configuration - Version : ${VERSION} - Prefix : ${prefix} - Compiler : ${CC} - - Enable debug : ${enable_debug} - Enable tests : ${enable_tests} - - Enable docs : ${enable_gtk_doc} - - Introspection support : ${found_introspection} - Vala support : ${enable_vala} - - Enable Test UI : ${HAVE_GTK} - - GrlNet support : ${HAVE_LIBSOUP} - GrlPls support : ${HAVE_TOTEM_PL_PARSER} - -" diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 3429f09..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# -# Makefile.am -# -# Author: Iago Toral Quiroga <itoral@igalia.com> -# -# Copyright (C) 2011 Igalia S.L. All rights reserved. - -SUBDIRS = man - -if ENABLE_GTK_DOC -SUBDIRS += grilo -endif - --include $(top_srcdir)/git.mk diff --git a/doc/grilo/Makefile.am b/doc/grilo/Makefile.am deleted file mode 100644 index 5c186a3..0000000 --- a/doc/grilo/Makefile.am +++ /dev/null @@ -1,129 +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=grilo - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -#DOC_MODULE_VERSION=2 - - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - -# 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)/src $(top_srcdir)/libs - -# 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= - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# 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=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html - -# 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= -CFILE_GLOB= - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= - -# Header files to ignore when scanning. Use base file name, no paths -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=config.h \ - grl-log-priv.h \ - grl-marshal.h \ - grl-metadata-key-priv.h \ - grl-net-mock-private.h \ - grl-operation-options-priv.h \ - grl-operation-priv.h \ - grl-plugin-priv.h \ - grl-registry-priv.h \ - grl-sync-priv.h \ - grl-type-builtins.h - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -program_listings = \ - configuring-plugins.c \ - browsing.c \ - searching.c \ - multivalues.c \ - efficient-metadata-resolution.c - -%.c: $(top_srcdir)/examples/%.c - cp -f $< $@ - -html-build.stamp: $(program_listings) - -# 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=overview.xml \ - quick-start.xml \ - environment-setup.xml \ - writing-apps.xml \ - plugins-sources.xml \ - plugins-testing.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=-I$(top_srcdir)/src -I$(top_srcdir)/src/data $(DEPS_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/lib@GRL_NAME@.la $(DEPS_LIBS) - -# 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 = *.o *.stamp $(DOC_MODULE).* $(program_listings) - -# 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/doc/man/Makefile.am b/doc/man/Makefile.am deleted file mode 100644 index bf467e5..0000000 --- a/doc/man/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# -# Makefile.am -# -# Author: Juan A. Suarez Romero <jasuarez@igalia.com> -# -# Copyright (C) 2016 Igalia S.L. All rights reserved. - -dist_man1_MANS = grl-inspect-0.3.1 grl-launch-0.3.1 - -if BUILD_GRILO_TEST_UI -dist_man1_MANS += grilo-test-ui-0.3.1 -endif - --include $(top_srcdir)/git.mk diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 86d9c10..0000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/data -LDADD = $(DEPS_LIBS) $(top_builddir)/src/lib@GRL_NAME@.la - -noinst_PROGRAMS = browsing configuring-plugins efficient-metadata-resolution \ - loading-plugins multivalues searching - -browsing_SOURCES = browsing.c - -if BUILD_GRILO_PLS -noinst_PROGRAMS += browsing-pls -browsing_pls_SOURCES = browsing-pls.c -browsing_pls_LDADD = $(LDADD) $(top_builddir)/libs/pls/libgrlpls-@GRL_MAJORMINOR@.la -endif - -configuring_plugins_SOURCES = configuring-plugins.c - -efficient_metadata_resolution_SOURCES = efficient-metadata-resolution.c - -loading_plugins_SOURCES = loading-plugins.c - -multivalues_SOURCES = multivalues.c - -searching_SOURCES = searching.c - --include $(top_srcdir)/git.mk @@ -1,303 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011,2012,2013 Behdad Esfahbod -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# is permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The latest version of this file can be downloaded from: -# https://raw.github.com/behdad/git.mk/master/git.mk -# Bugs, etc, should be reported upstream at: -# https://github.com/behdad/git.mk -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to -include git.mk. Remember to add that line to new -# Makefile.am files you create in your project, or just rerun the -# "make -f git.mk". -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local make targets. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved and I'll diagnose. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# Makefile.am.sample in the git.mk git repo. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu. -# -# This makefile provides the following targets: -# -# - all: "make all" will build all gitignore files. -# - gitignore: makes all gitignore files in the current dir and subdirs. -# - .gitignore: make gitignore file for the current dir. -# - gitignore-recurse: makes all gitignore files in the subdirs. -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# - - - -############################################################################### -# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: -############################################################################### - -# -# Most autotools-using modules should be fine including this variable in their -# toplevel MAINTAINERCLEANFILES: -GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/configure.scan \ - `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \ - test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ - for x in \ - ar-lib \ - compile \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - ; do echo "$$AUX_DIR/$$x"; done` \ - `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \ - head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` -# -# All modules should also be fine including the following variable, which -# removes automake-generated Makefile.in files: -GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ - `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \ - while read f; do \ - case $$f in Makefile|*/Makefile) \ - test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ - done` -# -# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also -# include this: -GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 - - - -############################################################################### -# Default rule is to install ourselves in all Makefile.am files: -############################################################################### - -git-all: git-mk-install - -git-mk-install: - @echo "Installing git makefile" - @any_failed=; \ - find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo "$$x already includes git.mk"; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo "Failed updating $$x"; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -.PHONY: git-all git-mk-install - - - -############################################################################### -# Actual .gitignore generation: -############################################################################### - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - @echo "git.mk: Generating $@" - @{ \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for lc in $(DOC_LINGUAS); do \ - for x in \ - $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ - $(DOC_PAGES) \ - $(DOC_INCLUDES) \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - for x in \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ - for lc in $(HELP_LINGUAS); do \ - for x in \ - $(HELP_FILES) \ - "$$lc.stamp" \ - "$$lc.mo" \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - po/Makefile.in.in \ - po/Makefile.in.in~ \ - po/Makefile.in \ - po/Makefile \ - po/Makevars.template \ - po/POTFILES \ - po/Rules-quot \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.header" \ - "po/*.mo" \ - "po/*.sed" \ - "po/*.sin" \ - po/$(GETTEXT_PACKAGE).pot \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DEJATOOL)" = x; then :; else \ - for x in \ - $(DEJATOOL) \ - ; do echo "/$$x.sum"; echo "/$$x.log"; done; \ - echo /site.exp; \ - fi; \ - if test "x$(am__dirstamp)" = x; then :; else \ - echo "$(am__dirstamp)"; \ - fi; \ - if test "x$(LTCOMPILE)" = x; then :; else \ - for x in \ - "*.lo" \ - ".libs" "_libs" \ - ; do echo "$$x"; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \ - $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ - $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ - so_locations \ - $(MOSTLYCLEANFILES) \ - $(TEST_LOGS) \ - $(TEST_LOGS:.log=.trs) \ - $(TEST_SUITE_LOG) \ - "*.$(OBJEXT)" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(DEPDIR) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ - $(filter %_vala.stamp,$(DIST_COMMON)) \ - $(filter %.vapi,$(DIST_COMMON)) \ - $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo "/$$x"; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore: $(srcdir)/.gitignore gitignore-recurse - -gitignore-recurse-maybe: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \ - done - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/libs/Makefile.am b/libs/Makefile.am deleted file mode 100644 index dbb585a..0000000 --- a/libs/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# Makefile.am -# -# Author: Víctor M. Jáquez L. <vjaquez@igalia.com> -# -# Copyright (C) 2010 Igalia S.L. All rights reserved. - -SUBDIRS = - -if BUILD_GRILO_NET -SUBDIRS += net -endif - -if BUILD_GRILO_PLS -SUBDIRS += pls -endif - -DIST_SUBDIRS = net pls - --include $(top_srcdir)/git.mk diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am deleted file mode 100644 index d119bca..0000000 --- a/libs/net/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -# -# Makefile.am -# -# Author: Víctor M. Jáquez L. <vjaquez@igalia.com> -# -# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved. - - -lib_LTLIBRARIES = libgrlnet-@GRL_MAJORMINOR@.la - -libgrlnet_@GRL_MAJORMINOR@_la_DEPENDENCIES = \ - $(top_builddir)/src/lib@GRL_NAME@.la - -libgrlnet_@GRL_MAJORMINOR@_la_SOURCES = \ - grl-net-mock.c \ - grl-net-wc.c - -libgrlnet_@GRL_MAJORMINOR@_la_CFLAGS = \ - -I $(top_srcdir)/src \ - -I $(top_srcdir)/src/data \ - -DLOCALEDIR=\"$(localedir)\" \ - $(DEPS_CFLAGS) \ - $(NET_CFLAGS) - -libgrlnet_@GRL_MAJORMINOR@_la_LIBADD = \ - $(top_builddir)/src/lib@GRL_NAME@.la \ - $(DEPS_LIBS) \ - $(NET_LIBS) - -libgrlnet_@GRL_MAJORMINOR@_la_LDFLAGS = \ - -version-info $(GRLNET_LT_VERSION) \ - -no-undefined - -libgrlnet_@GRL_MAJORMINOR@includedir = \ - $(includedir)/@GRL_NAME@/net - -libgrlnet_@GRL_MAJORMINOR@include_HEADERS = \ - grl-net-wc.h \ - grl-net.h - -noinst_HEADERS = \ - grl-net-mock-private.h - -CLEANFILES = *.gir - -# introspection support -if HAVE_INTROSPECTION --include $(INTROSPECTION_MAKEFILE) -gir_headers = $(patsubst %,$(srcdir)/%, $(libgrlnet_@GRL_MAJORMINOR@include_HEADERS)) -gir_sources = $(patsubst %,$(srcdir)/%, $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES)) - -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all - -introspection_sources = \ - $(gir_headers) \ - $(gir_sources) - -GrlNet-@GRL_MAJORMINOR@.gir: libgrlnet-@GRL_MAJORMINOR@.la -GrlNet_@GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4 -GrlNet_@GRL_MAJORMINOR_NORM@_gir_CFLAGS = -I $(top_srcdir)/src \ - -I $(top_srcdir)/src/data -I $(top_srcdir)/libs -GrlNet_@GRL_MAJORMINOR_NORM@_gir_LIBS = libgrlnet-@GRL_MAJORMINOR@.la \ - $(top_builddir)/src/lib@GRL_NAME@.la -GrlNet_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) -GrlNet_@GRL_MAJORMINOR_NORM@_gir_SCANNERFLAGS = --c-include="net/grl-net.h" -INTROSPECTION_GIRS += GrlNet-@GRL_MAJORMINOR@.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0/ -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) -endif - --include $(top_srcdir)/git.mk diff --git a/libs/pls/Makefile.am b/libs/pls/Makefile.am deleted file mode 100644 index f2504af..0000000 --- a/libs/pls/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -# -# Makefile.am -# -# Author: Mateu Batle <mateu.batle@collabora.com> -# -# Copyright (C) 2013 Collabora Ltd. All rights reserved. - - -lib_LTLIBRARIES = libgrlpls-@GRL_MAJORMINOR@.la - -libgrlpls_@GRL_MAJORMINOR@_la_DEPENDENCIES = \ - $(top_builddir)/src/lib@GRL_NAME@.la - -libgrlpls_@GRL_MAJORMINOR@_la_SOURCES = \ - grl-pls.c - -libgrlpls_@GRL_MAJORMINOR@_la_CFLAGS = \ - -I $(top_srcdir)/src \ - -I $(top_srcdir)/src/data \ - -DLOCALEDIR=\"$(localedir)\" \ - $(DEPS_CFLAGS) \ - $(TOTEM_PL_PARSER_CFLAGS) - -libgrlpls_@GRL_MAJORMINOR@_la_LIBADD = \ - $(top_builddir)/src/lib@GRL_NAME@.la \ - $(DEPS_LIBS) \ - $(TOTEM_PL_PARSER_LIBS) - -libgrlpls_@GRL_MAJORMINOR@_la_LDFLAGS = \ - -version-info $(GRLPLS_LT_VERSION) \ - -no-undefined - -libgrlpls_@GRL_MAJORMINOR@includedir = \ - $(includedir)/@GRL_NAME@/pls - -libgrlpls_@GRL_MAJORMINOR@include_HEADERS = \ - grl-pls.h - -CLEANFILES = *.gir - -# introspection support -if HAVE_INTROSPECTION --include $(INTROSPECTION_MAKEFILE) -gir_headers = $(patsubst %,$(srcdir)/%, $(libgrlpls_@GRL_MAJORMINOR@include_HEADERS)) -gir_sources = $(patsubst %,$(srcdir)/%, $(libgrlpls_@GRL_MAJORMINOR@_la_SOURCES)) - -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_srcdir)/src -INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src --includedir=$(top_builddir)/src - -introspection_sources = \ - $(gir_headers) \ - $(gir_sources) - -GrlPls-@GRL_MAJORMINOR@.gir: libgrlpls-@GRL_MAJORMINOR@.la -GrlPls_@GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 Gio-2.0 -GrlPls_@GRL_MAJORMINOR_NORM@_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/src/Grl-@GRL_MAJORMINOR@.gir -GrlPls_@GRL_MAJORMINOR_NORM@_gir_CFLAGS = -I $(top_srcdir)/src \ - -I $(top_srcdir)/src/data -I $(top_srcdir)/libs -GrlPls_@GRL_MAJORMINOR_NORM@_gir_LIBS = libgrlpls-@GRL_MAJORMINOR@.la \ - $(top_builddir)/src/lib@GRL_NAME@.la -GrlPls_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) -INTROSPECTION_GIRS += GrlPls-@GRL_MAJORMINOR@.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0/ -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) -endif - --include $(top_srcdir)/git.mk diff --git a/m4/introspection.m4 b/m4/introspection.m4 deleted file mode 100644 index bfc52be..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/m4/vapigen.m4 b/m4/vapigen.m4 deleted file mode 100644 index 2c435e7..0000000 --- a/m4/vapigen.m4 +++ /dev/null @@ -1,101 +0,0 @@ -dnl vapigen.m4 -dnl -dnl Copyright 2012 Evan Nemerson -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT]) -# -------------------------------------- -# Check vapigen existence and version -# -# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -AC_DEFUN([VAPIGEN_CHECK], -[ - AS_IF([test "x$3" != "xyes"], [ - m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [ - m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [ - AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]]) - ]) - ]) - ]) - - AC_ARG_ENABLE([vala], - [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ - AS_IF([test "x$4" = "x"], [ - enable_vala=auto - ], [ - enable_vala=$4 - ]) - ]) - - AS_CASE([$enable_vala], [no], [enable_vala=no], - [yes], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - AC_MSG_ERROR([Vala bindings require GObject Introspection]) - ]) - ], [auto], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - enable_vala=no - ]) - ], [ - AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) - ]) - - AS_IF([test "x$2" = "x"], [ - vapigen_pkg_name=vapigen - ], [ - vapigen_pkg_name=vapigen-$2 - ]) - AS_IF([test "x$1" = "x"], [ - vapigen_pkg="$vapigen_pkg_name" - ], [ - vapigen_pkg="$vapigen_pkg_name >= $1" - ]) - - PKG_PROG_PKG_CONFIG - - PKG_CHECK_EXISTS([$vapigen_pkg], [ - AS_IF([test "$enable_vala" = "auto"], [ - enable_vala=yes - ]) - ], [ - AS_CASE([$enable_vala], [yes], [ - AC_MSG_ERROR([$vapigen_pkg not found]) - ], [auto], [ - enable_vala=no - ]) - ]) - - AC_MSG_CHECKING([for vapigen]) - - AS_CASE([$enable_vala], - [yes], [ - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` - ], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` - ]) - ]) - - AC_MSG_RESULT([$enable_vala]) - - AC_SUBST([VAPIGEN]) - AC_SUBST([VAPIGEN_VAPIDIR]) - AC_SUBST([VAPIGEN_MAKEFILE]) - - AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -]) diff --git a/release.mk b/release.mk deleted file mode 100644 index 7a4b6e0..0000000 --- a/release.mk +++ /dev/null @@ -1,48 +0,0 @@ -changelog: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || ( rm -f ChangeLog.tmp ; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git clone is required to generate a ChangeLog >&2; \ - fi - -authors: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating AUTHORS && \ - ( cd "$(top_srcdir)" && \ - $(top_srcdir)/missing --run git ls-tree HEAD -r | awk '{ print $$4 }' ) > _files.tmp && \ - ( cd "$(top_srcdir)" && \ - $(top_srcdir)/missing --run git log --pretty="%an <%ae>" ) > _all.tmp && \ - ( cd "$(top_srcdir)" && \ - cat _all.tmp | awk -F"<" '{ print $$2 }' | sort | uniq -c | sort -rn ) > _by_commits.tmp && \ - ( cd "$(top_srcdir)" && \ - while read line ; do $(top_srcdir)/missing --run git blame -c -e "$$line" | \ - awk '{ print $$2 }' | cut -c2- ; done < _files.tmp | sort -u ) > _current.tmp && \ - touch _AUTHORS.current.tmp _AUTHORS.past.tmp && \ - cat _by_commits.tmp | awk '{ print $$2 }' | while read line ; do \ - if `grep -q "$$line" _current.tmp` ; then \ - grep -m 1 "$$line" _all.tmp >> _AUTHORS.current.tmp ; \ - else \ - grep -m 1 "$$line" _all.tmp >> _AUTHORS.past.tmp ; \ - fi \ - done && \ - echo Contributors: >> AUTHORS.tmp && \ - echo ============= >> AUTHORS.tmp && \ - cat _AUTHORS.current.tmp >> AUTHORS.tmp && \ - echo >> AUTHORS.tmp && \ - echo Past contributors: >> AUTHORS.tmp && \ - echo ================== >> AUTHORS.tmp && \ - cat _AUTHORS.past.tmp >> AUTHORS.tmp && \ - rm -fr _files.tmp _all.tmp _by_commits.tmp _current.tmp _AUTHORS.current.tmp _AUTHORS.past.tmp && \ - mv -f AUTHORS.tmp $(top_distdir)/AUTHORS; \ - else \ - echo A git clone is required to generate an AUTHORS >&2; \ - fi - -dist-hook: changelog authors diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 47bd6ef..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -# -# Makefile.am -# -# Author: Iago Toral Quiroga <itoral@igalia.com> -# -# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved. - -SUBDIRS = data - -BUILT_SOURCES = \ - grl-marshal.h \ - grl-marshal.c \ - grl-type-builtins.h \ - grl-type-builtins.c \ - $(NULL) - -# autogenerated files -grl-marshal.h: grl-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix grl_marshal \ - --header $< > $@ - -grl-marshal.c: grl-marshal.list grl-marshal.h - @echo "#include \"grl-marshal.h\"" > $@.tmp - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix grl_marshal \ - --body $< >> $@.tmp && mv $@.tmp $@ - -enum_headers = grl-source.h grl-caps.h grl-operation-options.h grl-metadata-key.h data/grl-media.h - -grl-type-builtins.h: $(enum_headers) grl-type-builtins.h.template - $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/grl-type-builtins.h.template \ - $(addprefix $(srcdir)/,$(enum_headers)) > $@ - -grl-type-builtins.c: grl-type-builtins.h $(enum_headers) grl-type-builtins.c.template - $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/grl-type-builtins.c.template \ - $(addprefix $(srcdir)/,$(enum_headers)) > $@ - -lib_LTLIBRARIES = lib@GRL_NAME@.la - -lib@GRL_NAME@_la_CFLAGS = \ - $(DEPS_CFLAGS) \ - -I$(srcdir) \ - -I$(srcdir)/data \ - -DLOCALEDIR=\"$(localedir)\" \ - -DGRILO_COMPILATION \ - -DG_LOG_DOMAIN=\"Grilo\" - -lib@GRL_NAME@_la_LIBADD = \ - $(DEPS_LIBS) - -lib@GRL_NAME@_la_LDFLAGS = \ - -version-info $(GRL_LT_VERSION) \ - -no-undefined - -lib@GRL_NAME@_la_SOURCES = \ - grl-plugin.c grl-plugin-priv.h \ - grl-registry.c grl-registry-priv.h \ - grl-metadata-key.c grl-metadata-key-priv.h \ - grl-type-builtins.c grl-type-builtins.h \ - grl-marshal.c grl-marshal.h \ - grl-operation.c grl-operation.h \ - grl-operation-priv.h grl-sync.c \ - grl-source.c \ - grl-util.c grl-multiple.c \ - grl-log.c grl-log-priv.h \ - grl-value-helper.c \ - grl-caps.c \ - grl-operation-options.c grl-operation-options-priv.h \ - grl-range-value.c \ - grilo.c - -data_c_sources = \ - data/grl-data.c \ - data/grl-related-keys.c \ - data/grl-media.c \ - data/grl-config.c - -lib@GRL_NAME@_la_SOURCES += $(data_c_sources) - -lib@GRL_NAME@incdir = \ - $(includedir)/@GRL_NAME@ - -lib@GRL_NAME@inc_HEADERS = \ - grilo.h \ - grl-error.h \ - grl-plugin.h \ - grl-registry.h \ - grl-metadata-key.h \ - grl-source.h \ - grl-log.h \ - grl-multiple.h \ - grl-util.h \ - grl-definitions.h \ - grl-operation.h \ - grl-value-helper.h \ - grl-caps.h \ - grl-operation-options.h \ - grl-range-value.h - -data_h_headers = \ - data/grl-data.h \ - data/grl-related-keys.h \ - data/grl-media.h \ - data/grl-config.h - -lib@GRL_NAME@inc_HEADERS += $(data_h_headers) - -noinst_HEADERS = \ - grl-registry-priv.h \ - grl-plugin-priv.h \ - grl-metadata-key-priv.h \ - grl-operation-priv.h \ - grl-sync-priv.h \ - grl-type-builtins.h \ - grl-operation-options-priv.h \ - grl-marshal.h - -EXTRA_DIST = \ - grl-marshal.list \ - grl-type-builtins.h.template \ - grl-type-builtins.c.template - -CLEANFILES = *.gir - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(srcdir)/data - -# introspection support -if HAVE_INTROSPECTION -introspection_sources = \ - $(lib@GRL_NAME@inc_HEADERS) \ - $(filter %.c,$(lib@GRL_NAME@_la_SOURCES)) \ - grl-type-builtins.h - -Grl-@GRL_MAJORMINOR@.gir: lib@GRL_NAME@.la -Grl_@GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 GModule-2.0 Gio-2.0 -Grl_@GRL_MAJORMINOR_NORM@_gir_CFLAGS = $(lib@GRL_NAME@_la_CFLAGS) -Grl_@GRL_MAJORMINOR_NORM@_gir_LIBS = lib@GRL_NAME@.la -Grl_@GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources) -Grl_@GRL_MAJORMINOR_NORM@_gir_SCANNERFLAGS = --c-include="grilo.h" -INTROSPECTION_GIRS += Grl-@GRL_MAJORMINOR@.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0/ -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) -endif - --include $(top_srcdir)/git.mk diff --git a/src/data/Makefile.am b/src/data/Makefile.am deleted file mode 100644 index ae44c94..0000000 --- a/src/data/Makefile.am +++ /dev/null @@ -1 +0,0 @@ --include $(top_srcdir)/git.mk diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 4df8cbc..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -SUBDIRS = . - -if HAVE_INTROSPECTION -SUBDIRS += python -endif - -# things to test - -noinst_PROGRAMS = $(TEST_PROGS) - -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/data $(DEPS_CFLAGS) -progs_ldadd = $(top_builddir)/src/lib@GRL_NAME@.la $(DEPS_LIBS) - -if BUILD_GRILO_NET -AM_CFLAGS += -I$(top_srcdir)/libs $(NET_CFLAGS) -progs_ldadd += $(top_builddir)/libs/net/libgrlnet-@GRL_MAJORMINOR@.la $(NET_LIBS) -endif - -TEST_PROGS = registry -registry_SOURCES = registry.c -registry_LDADD = $(progs_ldadd) - -TEST_PROGS += autoptr -autoptr_SOURCES = autoptr.c -autoptr_LDADD = $(progs_ldadd) - -if BUILD_GRILO_NET -TEST_PROGS += lib-net -lib_net_SOURCES = lib-net.c -lib_net_LDADD = $(progs_ldadd) -endif - -### testing rules (from glib) - -GTESTER = gtester - -# test: run all tests in cwd and subdirs -test: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} - -# test-report: run tests in subdirs and generate report -# perf-report: run tests in subdirs with -m perf and generate report -# full-report: like test-report: with -m perf and -m slow -test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ - case $@ in \ - test-report) test_options="-k";; \ - perf-report) test_options="-k -m=perf";; \ - full-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ - ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ - fi ; \ - } - @ ignore_logdir=true ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ - ignore_logdir=false ; \ - fi ; \ - for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done ; \ - $$ignore_logdir || { \ - echo '<?xml version="1.0"?>' > $@.xml ; \ - echo '<report-collection>' >> $@.xml ; \ - for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ - sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ - done ; \ - echo >> $@.xml ; \ - echo '</report-collection>' >> $@.xml ; \ - rm -rf "$$GTESTER_LOGDIR"/ ; \ - ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ - } -.PHONY: test test-report perf-report full-report -# run make test as part of make check -check-local: test - --include $(top_srcdir)/git.mk diff --git a/tests/python/Makefile.am b/tests/python/Makefile.am deleted file mode 100644 index 61af918..0000000 --- a/tests/python/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# things to test - -test: testrunner.py -if HAVE_INTROSPECTION - LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(top_builddir)/src/.libs/ \ - GI_TYPELIB_PATH=${GI_TYPELIB_PATH}:$(top_builddir)/src/ \ - PYTHONPATH=$(top_builddir):$(top_builddir)/src/tests/python:$${PYTHONPATH:+$$PYTHONPATH:} \ - $(PYTHON) $(srcdir)/testrunner.py -endif - -if HAVE_INTROSPECTION -EXTRA_DIST = \ - testrunner.py \ - test_registry.py \ - test_plugin.py -endif - -.PHONY: test test-report perf-report full-report -# run make test as part of make check -check-local: test - -MAINTAINERCLEANFILES = \ - *.pyc - --include $(top_srcdir)/git.mk diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 575d7c2..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -# -# Makefile.am -# -# Author: Iago Toral Quiroga <itoral@igalia.com> -# -# Copyright (C) 2010 Igalia S.L. All rights reserved. - -SUBDIRS = grilo-inspect grilo-launch - -if BUILD_GRILO_TEST_UI -SUBDIRS += grilo-test-ui -endif - -DIST_SUBDIRS = grilo-test-ui grilo-inspect grilo-launch - --include $(top_srcdir)/git.mk diff --git a/tools/grilo-inspect/Makefile.am b/tools/grilo-inspect/Makefile.am deleted file mode 100644 index 17e51ca..0000000 --- a/tools/grilo-inspect/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# -# Makefile.am -# -# Author: Juan A. Suarez Romero <jasuarez@igalia.com> -# -# Copyright (C) 2010 Igalia S.L. - -BUILT_SOURCES = grl-core-keys.h - -grl-inspect.c: grl-core-keys.h - -grl-core-keys.h: $(top_builddir)/src/grl-metadata-key.h - $(AWK) 'BEGIN { printf "gchar *grl_core_keys[] = {\n" } { if ( $$2 ~ /^GRL_METADATA_KEY_/ && $$2 !~ /_GET_/ ) printf "\""$$2"\",\n" } END { printf "};\n" }' $< > $@ - -bin_PROGRAMS = \ - grl-inspect-@GRL_MAJORMINOR@ - -grl_inspect_@GRL_MAJORMINOR@_SOURCES = \ - grl-inspect.c \ - grl-core-keys.h - -grl_inspect_@GRL_MAJORMINOR@_CFLAGS = \ - $(DEPS_CFLAGS) \ - -DPREFIX=$(prefix) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/data - -grl_inspect_@GRL_MAJORMINOR@_LDADD = \ - $(DEPS_LIBS) \ - $(GTK_LIBS) \ - $(top_builddir)/src/lib@GRL_NAME@.la - -noinst_HEADERS = grl-core-keys.h - --include $(top_srcdir)/git.mk diff --git a/tools/grilo-launch/Makefile.am b/tools/grilo-launch/Makefile.am deleted file mode 100644 index 1792e8a..0000000 --- a/tools/grilo-launch/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# Makefile.am -# -# Author: Juan A. Suarez Romero <jasuarez@igalia.com> -# -# Copyright (C) 2014 Igalia S.L. - -bin_PROGRAMS = \ - grl-launch-@GRL_MAJORMINOR@ - -grl_launch_@GRL_MAJORMINOR@_SOURCES = \ - grl-launch.c - -grl_launch_@GRL_MAJORMINOR@_CFLAGS = \ - $(DEPS_CFLAGS) \ - -DPREFIX=$(prefix) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/data - -grl_launch_@GRL_MAJORMINOR@_LDADD = \ - $(DEPS_LIBS) \ - $(top_builddir)/src/lib@GRL_NAME@.la - --include $(top_srcdir)/git.mk diff --git a/tools/grilo-test-ui/Makefile.am b/tools/grilo-test-ui/Makefile.am deleted file mode 100644 index a849af6..0000000 --- a/tools/grilo-test-ui/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# -# Makefile.am -# -# Author: Iago Toral <itoral@igalia.com> -# -# Copyright (C) 2010 Igalia S.L. - -bin_PROGRAMS = grilo-test-ui-@GRL_MAJORMINOR@ - -grilo_test_ui_@GRL_MAJORMINOR@_SOURCES = \ - main.c - -grilo_test_ui_@GRL_MAJORMINOR@_CFLAGS = \ - $(DEPS_CFLAGS) \ - $(GTU_CFLAGS) \ - $(GRL_FLICKR_CFLAGS) \ - -DPREFIX=$(prefix) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/data - -grilo_test_ui_@GRL_MAJORMINOR@_LDADD = \ - $(DEPS_LIBS) \ - $(GTU_LIBS) \ - $(GRL_FLICKR_LIBS) \ - $(top_builddir)/src/lib@GRL_NAME@.la - -if HAVE_OAUTH - -grilo_test_ui_@GRL_MAJORMINOR@_SOURCES += \ - flickr-oauth.h \ - flickr-oauth.c - -grilo_test_ui_@GRL_MAJORMINOR@_CFLAGS += \ - $(OAUTH_CFLAGS) - -grilo_test_ui_@GRL_MAJORMINOR@_LDADD += \ - $(OAUTH_LIBS) - -endif - --include $(top_srcdir)/git.mk |