From 4113d1bc0f8d39f99976b147c22f551879a3b4a2 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 15 Oct 2021 22:14:38 +0200 Subject: Remove Automake files --- Makefile.am | 21 --- Makefile.am.coverage | 48 ------- autogen.sh | 10 -- common/Makefile.am | 31 ----- configure.ac | 210 ----------------------------- data/Makefile.am | 35 ----- data/icons/16x16/Makefile.am | 1 - data/icons/16x16/categories/Makefile.am | 10 -- data/icons/16x16/status/Makefile.am | 10 -- data/icons/22x22/Makefile.am | 1 - data/icons/22x22/categories/Makefile.am | 8 -- data/icons/22x22/status/Makefile.am | 9 -- data/icons/24x24/Makefile.am | 1 - data/icons/24x24/status/Makefile.am | 10 -- data/icons/32x32/Makefile.am | 1 - data/icons/32x32/categories/Makefile.am | 9 -- data/icons/32x32/status/Makefile.am | 10 -- data/icons/48x48/Makefile.am | 1 - data/icons/48x48/status/Makefile.am | 10 -- data/icons/Makefile.am | 15 --- data/icons/scalable/Makefile.am | 1 - data/icons/scalable/categories/Makefile.am | 9 -- data/icons/scalable/status/Makefile.am | 10 -- doc/Makefile.am | 1 - doc/reference/Makefile.am | 19 --- libmessaging-menu/Makefile.am | 76 ----------- m4/ax_python_module.m4 | 49 ------- m4/gcov.m4 | 86 ------------ m4/gtest.m4 | 74 ---------- src/Makefile.am | 44 ------ tests/Makefile.am | 122 ----------------- 31 files changed, 942 deletions(-) delete mode 100644 Makefile.am delete mode 100644 Makefile.am.coverage delete mode 100755 autogen.sh delete mode 100644 common/Makefile.am delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 data/icons/16x16/Makefile.am delete mode 100644 data/icons/16x16/categories/Makefile.am delete mode 100644 data/icons/16x16/status/Makefile.am delete mode 100644 data/icons/22x22/Makefile.am delete mode 100644 data/icons/22x22/categories/Makefile.am delete mode 100644 data/icons/22x22/status/Makefile.am delete mode 100644 data/icons/24x24/Makefile.am delete mode 100644 data/icons/24x24/status/Makefile.am delete mode 100644 data/icons/32x32/Makefile.am delete mode 100644 data/icons/32x32/categories/Makefile.am delete mode 100644 data/icons/32x32/status/Makefile.am delete mode 100644 data/icons/48x48/Makefile.am delete mode 100644 data/icons/48x48/status/Makefile.am delete mode 100644 data/icons/Makefile.am delete mode 100644 data/icons/scalable/Makefile.am delete mode 100644 data/icons/scalable/categories/Makefile.am delete mode 100644 data/icons/scalable/status/Makefile.am delete mode 100644 doc/Makefile.am delete mode 100644 doc/reference/Makefile.am delete mode 100644 libmessaging-menu/Makefile.am delete mode 100644 m4/ax_python_module.m4 delete mode 100644 m4/gcov.m4 delete mode 100644 m4/gtest.m4 delete mode 100644 src/Makefile.am delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 16a9a77..0000000 --- a/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -SUBDIRS = \ - common \ - src \ - libmessaging-menu \ - data \ - po - -if ENABLE_GTK_DOC -SUBDIRS += doc -endif - -if BUILD_TESTS -SUBDIRS += \ - tests - -# build src first -tests: src libayatana-messaging-menu - -endif - -include $(top_srcdir)/Makefile.am.coverage diff --git a/Makefile.am.coverage b/Makefile.am.coverage deleted file mode 100644 index fb97747..0000000 --- a/Makefile.am.coverage +++ /dev/null @@ -1,48 +0,0 @@ - -# Coverage targets - -.PHONY: clean-gcno clean-gcda \ - coverage-html generate-coverage-html clean-coverage-html \ - coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr - -clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr - -if HAVE_GCOV - -clean-gcno: - @echo Removing old coverage instrumentation - -find -name '*.gcno' -print | xargs -r rm - -clean-gcda: - @echo Removing old coverage results - -find -name '*.gcda' -print | xargs -r rm - -coverage-html: clean-gcda - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html - -generate-coverage-html: - @echo Collecting coverage data - $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool - LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info - -clean-coverage-html: clean-gcda - -$(LCOV) --directory $(top_builddir) -z - -rm -rf coverage.info coveragereport - -if HAVE_GCOVR - -coverage-gcovr: clean-gcda - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr - -generate-coverage-gcovr: - @echo Generating coverage GCOVR report - $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml - -clean-coverage-gcovr: clean-gcda - -rm -rf $(top_builddir)/coverage.xml - -endif # HAVE_GCOVR - -endif # HAVE_GCOV diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index e3035d8..0000000 --- a/autogen.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -PKG_NAME="ayatana-indicator-messages" - -which mate-autogen || { - echo "You need mate-common from the MATE Desktop Environment" - exit 1 -} - -. mate-autogen diff --git a/common/Makefile.am b/common/Makefile.am deleted file mode 100644 index d1be198..0000000 --- a/common/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -noinst_LTLIBRARIES = libmessaging-common.la - -indicator-messages-service.c: org.ayatana.indicator.messages.service.xml - $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.ayatana.indicator.messages. \ - --generate-c-code indicator-messages-service \ - --c-namespace IndicatorMessages \ - $^ -indicator-messages-service.h: indicator-messages-service.c - -indicator-messages-application.c: org.ayatana.indicator.messages.application.xml - $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.ayatana.indicator.messages. \ - --generate-c-code indicator-messages-application \ - --c-namespace IndicatorMessages \ - $^ -indicator-messages-application.h: indicator-messages-application.c - -BUILT_SOURCES = \ - indicator-messages-service.c \ - indicator-messages-service.h \ - indicator-messages-application.c \ - indicator-messages-application.h - -libmessaging_common_la_SOURCES = \ - $(BUILT_SOURCES) - -libmessaging_common_la_CFLAGS = $(GIO_CFLAGS) -libmessaging_common_la_LIBADD = $(GIO_LIBS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index ae54f4c..0000000 --- a/configure.ac +++ /dev/null @@ -1,210 +0,0 @@ -AC_INIT(ayatana-indicator-messages, 0.8.2) - -AC_PREREQ(2.62) - -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE() - -AM_MAINTAINER_MODE - -IT_PROG_INTLTOOL([0.35.0]) - -AC_ISC_POSIX -AC_PROG_CC -AM_PROG_CC_C_O -AC_STDC_HEADERS -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -AC_SUBST(VERSION) -AC_CONFIG_MACRO_DIR([m4]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_ARG_ENABLE([deprecations], - [AS_HELP_STRING([--enable-deprecations], - [allow deprecated API usage @<:@default=yes@:>@])], - [], - [enable_deprecations=yes]) -AS_IF([test "x$enable_deprecations" = xno], - [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] -) - -# the Google Test targets are cpp -AC_PROG_CXX - -########################### -# Dependencies -########################### - -GIO_UNIX_REQUIRED_VERSION=2.33.10 -GLIB_REQUIRED_VERSION=2.35.4 -INTROSPECTION_REQUIRED_VERSION=1.32.0 - -PKG_CHECK_MODULES(APPLET, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION - accountsservice) - -PKG_CHECK_MODULES(GIO, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) - -AC_SUBST(APPLET_CFLAGS) -AC_SUBST(APPLET_LIBS) - -GLIB_GSETTINGS - -GTK_DOC_CHECK([1.18], [--flavour no-tmpl]) - -GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_REQUIRED_VERSION]) - -AC_ARG_WITH([indicator-dir], - [AS_HELP_STRING([--with-indicator-dir=DIR], [Ayatana Indicator directory [default=$datadir/ayatana/indicators]])], - [], - [with_indicator_dir=$datadir/ayatana/indicators]) -AC_SUBST([INDICATOR_DIR], [$with_indicator_dir]) - -######################### -# Check for systemd -######################### -PKG_CHECK_MODULES(SYSTEMD, systemd, - [has_systemd=yes], - [] -) -if test "x$has_systemd" = "xyes"; then - SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` - AC_SUBST(SYSTEMD_USERDIR) - AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicator-application.service for systemd]) -fi - -########################### -# gcov coverage reporting -########################### - -m4_include([m4/gcov.m4]) -AC_TDD_GCOV -AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) -AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) -AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) -AC_SUBST(COVERAGE_CFLAGS) -AC_SUBST(COVERAGE_CXXFLAGS) -AC_SUBST(COVERAGE_LDFLAGS) - -########################### -# Tests -########################### - -AC_ARG_ENABLE([tests], - [AS_HELP_STRING([--disable-tests], [Disable test scripts and tools (default=auto)])], - [enable_tests=${enableval}], - [enable_tests=auto]) -if test "x$enable_tests" != "xno"; then - PKG_CHECK_MODULES(DBUSTEST, dbustest-1) - m4_include([m4/gtest.m4]) - CHECK_GTEST - AM_PATH_PYTHON(3.0,, [:]) - AC_PYTHON_MODULE(dbusmock) - if test "x$have_gtest" = "xyes" -a "x$HAVE_PYMOD_DBUSMOCK" = "xyes"; then - enable_tests="yes" - else - if test "x$enable_tests" = "xyes"; then - AC_MSG_ERROR([tests were requested but gtest or dbusmock are not installed.]) - else - enable_tests="no" - fi - fi -fi -AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) - -########################### -# Vala API Generation -########################### - -AC_ARG_ENABLE([vala], - AC_HELP_STRING([--disable-vala], [Disable vala]), - [enable_vala=$enableval], [enable_vala=yes]) - -AS_IF([test "x$enable_vala" != "xno"],[ - AM_COND_IF([HAVE_INTROSPECTION],,[ - AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) - ]) -AC_PATH_PROG([VALA_API_GEN], [vapigen]) -]) -AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) - -############################## -# Custom Junk -############################## - -AC_DEFUN([AC_DEFINE_PATH], [ - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_path=`eval echo [$]$2` - ac_define_path=`eval echo [$]ac_define_path` - $1="$ac_define_path" - AC_SUBST($1) - ifelse($3, , - AC_DEFINE_UNQUOTED($1, "$ac_define_path"), - AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3)) -]) - -########################### -# Internationalization -########################### - -GETTEXT_PACKAGE=ayatana-indicator-messages -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain]) -AC_DEFINE_PATH(LOCALEDIR, "${datadir}/locale", [locale directory]) - -AM_GLIB_GNU_GETTEXT - -########################### -# Files -########################### - -AC_OUTPUT([ -Makefile -src/Makefile -common/Makefile -data/Makefile -data/icons/Makefile -data/icons/16x16/Makefile -data/icons/16x16/status/Makefile -data/icons/16x16/categories/Makefile -data/icons/22x22/Makefile -data/icons/22x22/status/Makefile -data/icons/22x22/categories/Makefile -data/icons/24x24/Makefile -data/icons/24x24/status/Makefile -data/icons/32x32/Makefile -data/icons/32x32/status/Makefile -data/icons/32x32/categories/Makefile -data/icons/48x48/Makefile -data/icons/48x48/status/Makefile -data/icons/scalable/Makefile -data/icons/scalable/status/Makefile -data/icons/scalable/categories/Makefile -po/Makefile.in -tests/Makefile -libmessaging-menu/Makefile -libmessaging-menu/messaging-menu.pc -doc/Makefile -doc/reference/Makefile -doc/reference/messaging-menu-docs.xml -]) - -########################### -# Results -########################### - -AC_MSG_NOTICE([ - -Messaging Indicator Configuration: - - Prefix: $prefix - Indicator Dir: $INDICATORDIR - tests: $enable_tests - gcov: $use_gcov - introspecion: $enable_introspection - Vala bindings: $enable_vala - documentation: $enable_gtk_doc -]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index b88aee5..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -NULL = - -SUBDIRS = icons - -xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = ayatana-indicator-messages.desktop - -%.desktop: %.desktop.in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml -@GSETTINGS_RULES@ - -#if defined(HAVE_SYSTEMD) -systemdservice_file = ayatana-indicator-messages.service -$(systemdservice_file): $(systemdservice_file).in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -systemddir = $(SYSTEMD_USERDIR) -systemd_DATA = $(systemdservice_file) -#endif - -indicatordir = $(INDICATOR_DIR) -dist_indicator_DATA = org.ayatana.indicator.messages - -EXTRA_DIST = \ - ayatana-indicator-messages.desktop.in \ - $(gsettings_SCHEMAS) \ - $(systemdservice_file).in \ - $(NULL) - -CLEANFILES = \ - $(xdg_autostart_DATA) \ - $(systemdservice_file) \ - $(NULL) diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am deleted file mode 100644 index 4b46952..0000000 --- a/data/icons/16x16/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status categories diff --git a/data/icons/16x16/categories/Makefile.am b/data/icons/16x16/categories/Makefile.am deleted file mode 100644 index 2ddfa63..0000000 --- a/data/icons/16x16/categories/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/16x16/categories - -icons_DATA = \ - applications-email-panel.png \ - applications-chat-panel.png \ - applications-microblogging-panel.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am deleted file mode 100644 index adafb8c..0000000 --- a/data/icons/16x16/status/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/16x16/status - -icons_DATA = \ - application-running.png \ - indicator-messages.png \ - indicator-messages-new.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am deleted file mode 100644 index 4b46952..0000000 --- a/data/icons/22x22/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status categories diff --git a/data/icons/22x22/categories/Makefile.am b/data/icons/22x22/categories/Makefile.am deleted file mode 100644 index b1ea14c..0000000 --- a/data/icons/22x22/categories/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/22x22/categories - -icons_DATA = \ - applications-email-panel.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am deleted file mode 100644 index 470c817..0000000 --- a/data/icons/22x22/status/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/22x22/status - -icons_DATA = \ - indicator-messages.png \ - indicator-messages-new.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am deleted file mode 100644 index d52da2b..0000000 --- a/data/icons/24x24/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am deleted file mode 100644 index 086c404..0000000 --- a/data/icons/24x24/status/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/24x24/status - -icons_DATA = \ - application-running.png \ - indicator-messages.png \ - indicator-messages-new.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am deleted file mode 100644 index 4b46952..0000000 --- a/data/icons/32x32/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status categories diff --git a/data/icons/32x32/categories/Makefile.am b/data/icons/32x32/categories/Makefile.am deleted file mode 100644 index 6fcfb7b..0000000 --- a/data/icons/32x32/categories/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/32x32/categories - -icons_DATA = \ - applications-email-panel.png \ - applications-chat-panel.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am deleted file mode 100644 index 00f9d53..0000000 --- a/data/icons/32x32/status/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/32x32/status - -icons_DATA = \ - application-running.png \ - indicator-messages.png \ - indicator-messages-new.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am deleted file mode 100644 index d52da2b..0000000 --- a/data/icons/48x48/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am deleted file mode 100644 index 9c560b5..0000000 --- a/data/icons/48x48/status/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/48x48/status - -icons_DATA = \ - application-running.png \ - indicator-messages.png \ - indicator-messages-new.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 44cd81b..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48 - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am deleted file mode 100644 index 4b46952..0000000 --- a/data/icons/scalable/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status categories diff --git a/data/icons/scalable/categories/Makefile.am b/data/icons/scalable/categories/Makefile.am deleted file mode 100644 index 0fdbbd7..0000000 --- a/data/icons/scalable/categories/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/scalable/categories - -icons_DATA = \ - applications-email-panel.svg \ - applications-chat-panel.svg - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am deleted file mode 100644 index 59f0256..0000000 --- a/data/icons/scalable/status/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -iconsdir = $(datadir)/icons/hicolor/scalable/status - -icons_DATA = \ - application-running.svg \ - indicator-messages.svg \ - indicator-messages-new.svg - -EXTRA_DIST = $(icons_DATA) - diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index f3ddc22..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = reference diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am deleted file mode 100644 index 1dfac8a..0000000 --- a/doc/reference/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -DOC_MODULE = messaging-menu - -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -DOC_SOURCE_DIR = $(top_srcdir)/libmessaging-menu - -MKDB_OPTIONS=--xml-mode --output-format=xml - -# Used for dependencies. The docs will be rebuilt if any of these change. -HFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.h -CFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.c - -IGNORE_HFILES= \ - indicator-messages-service.h - -AM_CPPFLAGS=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/libmessaging-menu/libmessaging-menu.la - -include $(top_srcdir)/gtk-doc.make diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am deleted file mode 100644 index 2f178b5..0000000 --- a/libmessaging-menu/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -lib_LTLIBRARIES = libmessaging-menu.la - -libmessaging_menu_ladir = $(includedir)/messaging-menu - -libmessaging_menu_la_SOURCES = \ - messaging-menu-app.c \ - messaging-menu-message.c - -libmessaging_menu_la_HEADERS = \ - messaging-menu-app.h \ - messaging-menu.h \ - messaging-menu-message.h - -libmessaging_menu_la_LIBADD = \ - $(GIO_LIBS) \ - $(top_builddir)/common/libmessaging-common.la - -libmessaging_menu_la_CFLAGS = \ - -I$(top_builddir)/common \ - $(GIO_CFLAGS) \ - -Wall - -libmessaging_menu_la_LDFLAGS = -export-symbols-regex "^messaging_menu_.*" - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = messaging-menu.pc - - --include $(INTROSPECTION_MAKEFILE) - -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -if HAVE_INTROSPECTION - -MessagingMenu-1.0.gir: libmessaging-menu.la -MessagingMenu_1_0_gir_NAMESPACE = MessagingMenu -MessagingMenu_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 -MessagingMenu_1_0_gir_CFLAGS = $(INCLUDES) $(GIO_CFLAGS) -MessagingMenu_1_0_gir_SCANNERFLAGS = --c-include="messaging-menu.h" -MessagingMenu_1_0_gir_LIBS = libmessaging-menu.la -MessagingMenu_1_0_gir_FILES = \ - messaging-menu-app.c \ - messaging-menu-app.h \ - messaging-menu-message.c \ - messaging-menu-message.h -MessagingMenu_1_0_gir_EXPORT_PACKAGES = messaging-menu -INTROSPECTION_GIRS += MessagingMenu-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES = $(gir_DATA) $(typelib_DATA) - - -######################### -# VAPI Files -######################### - -if HAVE_VALA - -vapidir = $(datadir)/vala/vapi -vapi_DATA = MessagingMenu-1.0.vapi - -MessagingMenu-1.0.vapi: MessagingMenu-1.0.gir - $(VALA_API_GEN) --pkg gio-2.0 --library=MessagingMenu-1.0 $< - -CLEANFILES += $(vapi_DATA) - -endif - -endif diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4 deleted file mode 100644 index bd70a06..0000000 --- a/m4/ax_python_module.m4 +++ /dev/null @@ -1,49 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_python_module.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PYTHON_MODULE(modname[, fatal]) -# -# DESCRIPTION -# -# Checks for Python module. -# -# If fatal is non-empty then absence of a module will trigger an error. -# -# LICENSE -# -# Copyright (c) 2008 Andrew Collier -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 5 - -AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) -AC_DEFUN([AX_PYTHON_MODULE],[ - if test -z $PYTHON; - then - PYTHON="python" - fi - PYTHON_NAME=`basename $PYTHON` - AC_MSG_CHECKING($PYTHON_NAME module: $1) - $PYTHON -c "import $1" 2>/dev/null - if test $? -eq 0; - then - AC_MSG_RESULT(yes) - eval AS_TR_CPP(HAVE_PYMOD_$1)=yes - else - AC_MSG_RESULT(no) - eval AS_TR_CPP(HAVE_PYMOD_$1)=no - # - if test -n "$2" - then - AC_MSG_ERROR(failed to find required module $1) - exit 1 - fi - fi -]) diff --git a/m4/gcov.m4 b/m4/gcov.m4 deleted file mode 100644 index bd96386..0000000 --- a/m4/gcov.m4 +++ /dev/null @@ -1,86 +0,0 @@ -# Checks for existence of coverage tools: -# * gcov -# * lcov -# * genhtml -# * gcovr -# -# Sets ac_cv_check_gcov to yes if tooling is present -# and reports the executables to the variables LCOV, GCOVR and GENHTML. -AC_DEFUN([AC_TDD_GCOV], -[ - AC_ARG_ENABLE(gcov, - AS_HELP_STRING([--enable-gcov], - [enable coverage testing with gcov]), - [use_gcov=$enableval], [use_gcov=no]) - - if test "x$use_gcov" = "xyes"; then - # we need gcc: - if test "$GCC" != "yes"; then - AC_MSG_ERROR([GCC is required for --enable-gcov]) - fi - - # Check if ccache is being used - AC_CHECK_PROG(SHTOOL, shtool, shtool) - case `$SHTOOL path $CC` in - *ccache*[)] gcc_ccache=yes;; - *[)] gcc_ccache=no;; - esac - - if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then - AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) - fi - - lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" - AC_CHECK_PROG(LCOV, lcov, lcov) - AC_CHECK_PROG(GENHTML, genhtml, genhtml) - - if test "$LCOV"; then - AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ - glib_cv_lcov_version=invalid - lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` - for lcov_check_version in $lcov_version_list; do - if test "$lcov_version" = "$lcov_check_version"; then - glib_cv_lcov_version="$lcov_check_version (ok)" - fi - done - ]) - else - lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" - AC_MSG_ERROR([$lcov_msg]) - fi - - case $glib_cv_lcov_version in - ""|invalid[)] - lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." - AC_MSG_ERROR([$lcov_msg]) - LCOV="exit 0;" - ;; - esac - - if test -z "$GENHTML"; then - AC_MSG_ERROR([Could not find genhtml from the lcov package]) - fi - - ac_cv_check_gcov=yes - ac_cv_check_lcov=yes - - # Remove all optimization flags from CFLAGS - changequote({,}) - CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` - changequote([,]) - - # Add the special gcc flags - COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" - COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" - COVERAGE_LDFLAGS="-lgcov" - - # Check availability of gcovr - AC_CHECK_PROG(GCOVR, gcovr, gcovr) - if test -z "$GCOVR"; then - ac_cv_check_gcovr=no - else - ac_cv_check_gcovr=yes - fi - -fi -]) # AC_TDD_GCOV diff --git a/m4/gtest.m4 b/m4/gtest.m4 deleted file mode 100644 index 6598ba7..0000000 --- a/m4/gtest.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl GTEST_LIB_CHECK([minimum version [, -dnl action if found [,action if not found]]]) -dnl -dnl Check for the presence of the Google Test library, optionally at a minimum -dnl version, and indicate a viable version with the HAVE_GTEST flag. It defines -dnl standard variables for substitution including GTEST_CPPFLAGS, -dnl GTEST_CXXFLAGS, GTEST_LDFLAGS, and GTEST_LIBS. It also defines -dnl GTEST_VERSION as the version of Google Test found. Finally, it provides -dnl optional custom action slots in the event GTEST is found or not. -AC_DEFUN([GTEST_LIB_CHECK], -[ -dnl Provide a flag to enable or disable Google Test usage. -AC_ARG_ENABLE([gtest], - [AS_HELP_STRING([--enable-gtest], - [Enable tests using the Google C++ Testing Framework. - (Default is enabled.)])], - [], - [enable_gtest=]) -AC_ARG_VAR([GTEST_CONFIG], - [The exact path of Google Test's 'gtest-config' script.]) -AC_ARG_VAR([GTEST_CPPFLAGS], - [C-like preprocessor flags for Google Test.]) -AC_ARG_VAR([GTEST_CXXFLAGS], - [C++ compile flags for Google Test.]) -AC_ARG_VAR([GTEST_LDFLAGS], - [Linker path and option flags for Google Test.]) -AC_ARG_VAR([GTEST_LIBS], - [Library linking flags for Google Test.]) -AC_ARG_VAR([GTEST_VERSION], - [The version of Google Test available.]) -HAVE_GTEST="no" -AS_IF([test "x${enable_gtest}" != "xno"], - [AC_MSG_CHECKING([for 'gtest-config']) - AS_IF([test "x${enable_gtest}" != "xyes"], - [AS_IF([test -x "${enable_gtest}/scripts/gtest-config"], - [GTEST_CONFIG="${enable_gtest}/scripts/gtest-config"], - [GTEST_CONFIG="${enable_gtest}/bin/gtest-config"]) - AS_IF([test -x "${GTEST_CONFIG}"], [], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([dnl -Unable to locate either a built or installed Google Test. -The specific location '${enable_gtest}' was provided for a built or installed -Google Test, but no 'gtest-config' script could be found at this location.]) - ])], - [AC_PATH_PROG([GTEST_CONFIG], [gtest-config])]) - AS_IF([test -x "${GTEST_CONFIG}"], - [AC_MSG_RESULT([${GTEST_CONFIG}]) - m4_ifval([$1], - [_gtest_min_version="--min-version=$1" - AC_MSG_CHECKING([for Google Test at least version >= $1])], - [_gtest_min_version="--min-version=0" - AC_MSG_CHECKING([for Google Test])]) - AS_IF([${GTEST_CONFIG} ${_gtest_min_version}], - [AC_MSG_RESULT([yes]) - HAVE_GTEST='yes'], - [AC_MSG_RESULT([no])])], - [AC_MSG_RESULT([no])]) - AS_IF([test "x${HAVE_GTEST}" = "xyes"], - [GTEST_CPPFLAGS=`${GTEST_CONFIG} --cppflags` - GTEST_CXXFLAGS=`${GTEST_CONFIG} --cxxflags` - GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` - GTEST_LIBS=`${GTEST_CONFIG} --libs` - GTEST_VERSION=`${GTEST_CONFIG} --version` - AC_DEFINE([HAVE_GTEST],[1],[Defined when Google Test is available.])], - [AS_IF([test "x${enable_gtest}" = "xyes"], - [AC_MSG_ERROR([dnl -Google Test was enabled, but no viable version could be found.]) - ])])]) -AC_SUBST([HAVE_GTEST]) -AM_CONDITIONAL([HAVE_GTEST],[test "x$HAVE_GTEST" = "xyes"]) -AS_IF([test "x$HAVE_GTEST" = "xyes"], - [m4_ifval([$2], [$2])], - [m4_ifval([$3], [$3])]) -]) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index bc6205f..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -EXTRA_DIST = - -pkglibexec_PROGRAMS = ayatana-indicator-messages-service - -ayatana_indicator_messages_service_SOURCES = \ - messages-service.c \ - dbus-data.h \ - gactionmuxer.c \ - gactionmuxer.h \ - gsettingsstrv.c \ - gsettingsstrv.h \ - im-accounts-service.c \ - im-accounts-service.h \ - im-menu.c \ - im-menu.h \ - im-phone-menu.c \ - im-phone-menu.h \ - im-desktop-menu.c \ - im-desktop-menu.h \ - im-application-list.c \ - im-application-list.h \ - indicator-desktop-shortcuts.c \ - indicator-desktop-shortcuts.h - -ayatana_indicator_messages_service_CFLAGS = \ - $(APPLET_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -I$(top_builddir)/common \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Wno-error=deprecated-declarations \ - -DG_LOG_DOMAIN=\"Ayatana-Indicator-Messages\" - -ayatana_indicator_messages_service_LDADD = \ - $(top_builddir)/common/libmessaging-common.la \ - $(APPLET_LIBS) - -ayatana_indicator_messages_service_LDFLAGS = \ - $(COVERAGE_LDFLAGS) - -EXTRA_DIST += \ - ayatana-messages-service.xml diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index c6a3db6..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -CLEANFILES= -check_LTLIBRARIES = libgtest.la -check_PROGRAMS = test-gactionmuxer - -TESTS = $(check_PROGRAMS) - -AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ - -I${top_srcdir}/src - -###################################### -# Google Test -###################################### - -nodist_libgtest_la_SOURCES = \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc -libgtest_la_CPPFLAGS = \ - $(GTEST_CPPFLAGS) -w \ - $(AM_CPPFLAGS) -libgtest_la_CXXFLAGS = \ - $(AM_CXXFLAGS) - -###################################### -# GActionMixer -###################################### - -test_gactionmuxer_SOURCES = \ - test-gactionmuxer.cpp - -test_gactionmuxer_CPPFLAGS = \ - $(APPLET_CFLAGS) \ - $(AM_CPPFLAGS) - -test_gactionmuxer_LDADD = \ - $(APPLET_LIBS) \ - libindicator-messages-service.la \ - libgtest.la - -###################################### -# Indicator Test -###################################### - -SCHEMA_COMPILED_DIR="$(abs_builddir)/gsettings-schemas-compiled/" - -indicator_test_SOURCES = \ - indicator-test.cpp - -indicator_test_CPPFLAGS = \ - -DINDICATOR_MESSAGES_SERVICE_BINARY="\"$(abs_top_builddir)/src/ayatana-indicator-messages-service\"" \ - -DSCHEMA_DIR="\"$(SCHEMA_COMPILED_DIR)\"" \ - -DXDG_DATA_DIRS="\"$(abs_srcdir)/\"" \ - -I$(top_srcdir)/libmessaging-menu \ - -std=c++11 \ - $(APPLET_CFLAGS) \ - $(DBUSTEST_CFLAGS) \ - $(AM_CPPFLAGS) - -indicator_test_LDADD = \ - $(APPLET_LIBS) \ - $(DBUSTEST_LIBS) \ - $(top_builddir)/libmessaging-menu/libmessaging-menu.la \ - libgtest.la \ - -lc -lpthread - -indicator-test.cpp: schemas-compiled.stamp - -schemas-compiled.stamp: $(top_srcdir)/data/*gschema.xml - @rm -rf $(SCHEMA_COMPILED_DIR) - @mkdir -p $(SCHEMA_COMPILED_DIR) - @cp -f $(top_srcdir)/data/*gschema.xml $(SCHEMA_COMPILED_DIR) - @`pkg-config gio-2.0 --variable glib_compile_schemas` $(SCHEMA_COMPILED_DIR) - @touch schemas-compiled.stamp - -CLEANFILES += schemas-compiled.stamp -TESTS += indicator-test -check_PROGRAMS += indicator-test - -###################################### -# Lib containing code under test -###################################### - -noinst_LTLIBRARIES = \ - libindicator-messages-service.la - -libindicator_messages_service_la_SOURCES = \ - $(top_builddir)/common/indicator-messages-service.c \ - $(top_builddir)/common/indicator-messages-service.h \ - $(top_srcdir)/src/gactionmuxer.c \ - $(top_srcdir)/src/gactionmuxer.h \ - $(top_srcdir)/src/dbus-data.h - -libindicator_messages_service_ladir = \ - $(includedir)/libayatana-indicator-messages-service/ - -libindicator_messages_service_la_CFLAGS = \ - $(APPLET_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -I$(top_builddir)/src \ - -I$(top_builddir)/common \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Wno-error=deprecated-declarations \ - -DG_LOG_DOMAIN=\"Ayatana-Indicator-Messages\" - -libindicator_messages_service_la_LIBADD = \ - $(APPLET_LIBS) - -libindicator_messages_service_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) - -###################################### -# Test client with dbusmock -###################################### - -TESTS_ENVIRONMENT = \ - export LD_LIBRARY_PATH=$(top_builddir)/libmessaging-menu/.libs; \ - export GI_TYPELIB_PATH=$(top_builddir)/libmessaging-menu; \ - export XDG_DATA_DIRS=$(abs_srcdir); - -TESTS += test-client.py -- cgit v1.2.3