diff options
| -rw-r--r-- | Makefile.am | 48 | ||||
| -rw-r--r-- | README.md | 16 | ||||
| -rwxr-xr-x | autogen.sh | 39 | ||||
| -rw-r--r-- | configure.ac | 117 | ||||
| -rw-r--r-- | data/Makefile.am | 65 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 26 | ||||
| -rw-r--r-- | git.mk | 400 | ||||
| -rw-r--r-- | m4/gtkdoc_jh_check_xml_catalog.m4 | 16 | ||||
| -rw-r--r-- | m4/gtkdoc_jh_path_xml_catalog.m4 | 61 | ||||
| -rw-r--r-- | man/Makefile.am | 21 | ||||
| -rw-r--r-- | src/Makefile.am | 96 | ||||
| -rw-r--r-- | vapi/Makefile.am | 10 |
12 files changed, 4 insertions, 911 deletions
diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 441f25c..0000000 --- a/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -NULL= -SUBDIRS = vapi src data po -if BUILD_MAN_PAGES -SUBDIRS += man -endif -DIST_SUBDIRS = vapi src data po man - -EXTRA_DIST = \ - autogen.sh \ - meson.build \ - data/meson.build \ - man/meson.build \ - po/meson.build \ - src/meson.build \ - meson_options.txt \ - meson_post_install.py \ - $(NULL) - -ChangeLog: - $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ - fi - - -distclean-local: - if test "$(srcdir)" = "."; then :; else \ - rm -f ChangeLog; \ - fi - -GITIGNOREFILES = \ - m4 - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - INSTALL - --include $(top_srcdir)/git.mk @@ -3,19 +3,11 @@ Contacts organizes your contacts information from all your online and offline sources, providing a centralized place for managing your contacts. ## Building -First download the source code from git: +You can build and install Contacts using [Meson](http://mesonbuild.com/): ```sh -git clone git://git.gnome.org/gnome-contacts -cd gnome-contacts -``` - -You can then build Contacts using either [Meson](http://mesonbuild.com/) or -Autotools: -```sh -# Meson -meson build && ninja -C build -# Autotools -./autogen.sh && make +meson build +ninja -C build +ninja -C build install ``` ## Issue tracker diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index f976de4..0000000 --- a/autogen.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -test -n "$srcdir" || srcdir=$(dirname "$0") -test -n "$srcdir" || srcdir=. - -olddir=$(pwd) - -cd $srcdir - -(test -f configure.ac) || { - echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" - exit 1 -} - -# shellcheck disable=SC2016 -PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 - echo "*** If you wish to pass any to it, please specify them on the" >&2 - echo "*** '$0' command line." >&2 - echo "" >&2 -fi - -git submodule update --init --recursive - -aclocal --install || exit 1 -autoreconf --verbose --force --install || exit 1 - -cd "$olddir" -if [ "$NOCONFIGURE" = "" ]; then - $srcdir/configure "$@" || exit 1 - - if [ "$1" = "--help" ]; then exit 0 else - echo "Now type 'make' to compile $PKG_NAME" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 768f845..0000000 --- a/configure.ac +++ /dev/null @@ -1,117 +0,0 @@ -AC_PREREQ([2.67]) -AC_INIT([gnome-contacts],[3.26],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts]) -AC_CONFIG_SRCDIR([src/main.vala]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz no-dist-gzip -Wno-portability]) - -# Enable silent rules is available -AM_SILENT_RULES([yes]) - -GETTEXT_PACKAGE=gnome-contacts -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package]) -AC_SUBST(GETTEXT_PACKAGE) - -AM_GNU_GETTEXT_VERSION([0.19.7]) -AM_GNU_GETTEXT([external]) - -LT_INIT -AC_PROG_CC -AM_PROG_VALAC([0.24.0]) -AC_PROG_INSTALL -AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources]) -GLIB_GSETTINGS - -GLIB_REQUIRED=2.44.0 -AC_SUBST(GLIB_REQUIRED) - -pkg_modules="gtk+-3.0 >= 3.22.0 - glib-2.0 >= $GLIB_REQUIRED - gmodule-export-2.0 - gnome-desktop-3.0 - gio-unix-2.0 >= $GLIB_REQUIRED - folks >= 0.11.4 - folks-telepathy - folks-eds - telepathy-glib >= 0.22.0 - libebook-1.2 >= 3.13.90 - libedataserver-1.2 >= 3.13.90 - libedataserverui-1.2 >= 3.13.90 - goa-1.0 - gee-0.8 - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 - " -PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - -CONTACTS_PACKAGES="--pkg gtk+-3.0 --pkg gio-2.0 --pkg gio-unix-2.0 --pkg gnome-desktop-3.0 --pkg folks --pkg folks-telepathy --pkg folks-eds --pkg clutter-1.0 --pkg clutter-gtk-1.0 --pkg champlain-0.12 --pkg geocode-glib-1.0" - -# Optional dependency for the user accounts panel -AC_ARG_WITH([cheese], - AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),, - with_cheese=auto) - -if test x"$with_cheese" != x"no" ; then - PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.3.91 cheese, [have_cheese=yes], [have_cheese=no]) - if test x${have_cheese} = xyes; then - AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support]) - CONTACTS_PACKAGES+=" --pkg cheese --pkg cheese-gtk" - fi - if test x${with_cheese} = xyes && test x${have_cheese} = xno; then - AC_MSG_ERROR([Cheese configured but not found]) - fi -else - have_cheese=no -fi -AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) - - -AC_SUBST(CONTACTS_PACKAGES) - -############# -# Resources # -############# - -GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` -AC_SUBST(GLIB_COMPILE_RESOURCES) - -################# -# Documentation # -################# - -AC_ARG_ENABLE([man-pages], - [AS_HELP_STRING([--disable-man-pages], - [disable building man pages])]) -AS_IF([test "x$enable_man_pages" != "xno"], - [AC_PATH_PROG([XSLTPROC], [xsltproc]) - AS_IF([test "xac_cv_path_XSLTPROC" = "x"], [have_xsltproc=no], - [have_xsltproc=yes]) - JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.2//EN], - [DocBook XML DTD V4.2], [have_docbookdtd=yes], - [have_docbookdtd=no]) - JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl], - [DocBook XSL Stylesheets], [have_docbookxsl=yes], - [have_docbookxsl=no]) - AS_IF([test "x$have_xsltproc" = "xyes" -a "x$have_docbookdtd" = "xyes" \ - -a "x$have_docbookxsl" = "xyes"], - [have_manutils=yes], - [AS_IF([test "x$enable_man_pages" = "xyes"], - [AC_MSG_ERROR([man page requested but required utilities were not found])]) - have_manutils=no])], - [have_manutils=no]) - -AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$have_manutils" = "xyes"]) - -AC_CONFIG_FILES([Makefile - vapi/Makefile - src/Makefile - man/Makefile - data/Makefile - data/icons/Makefile - po/Makefile.in - ]) - -AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 3e11029..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -NULL = - -SUBDIRS = icons - -org.gnome.Contacts.desktop: org.gnome.Contacts.desktop.in - $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ -desktopdir = $(datadir)/applications -desktop_DATA = org.gnome.Contacts.desktop - -org.gnome.Contacts.appdata.xml: org.gnome.Contacts.appdata.xml.in - $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ -appdatadir = $(datadir)/appdata -appdata_DATA = org.gnome.Contacts.appdata.xml - -searchproviderdir = $(datadir)/gnome-shell/search-providers -searchprovider_DATA = org.gnome.Contacts.search-provider.ini - -servicedir = $(datadir)/dbus-1/services -service_DATA = \ - org.gnome.Contacts.SearchProvider.service \ - org.gnome.Contacts.service - -%.service: %.service.in Makefile - $(AM_V_GEN) [ -d $(@D) ] || $(mkdir_p) $(@D) ; \ - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@ - -org.gnome.Contacts.service: - $(AM_V_GEN) (echo '[D-BUS Service]'; \ - echo 'Name=org.gnome.Contacts'; \ - echo 'Exec=${bindir}/gnome-contacts --gapplication-service') > $@.tmp && \ - mv $@.tmp $@ - -EXTRA_DIST = \ - org.gnome.Contacts.desktop.in \ - org.gnome.Contacts.service.in \ - org.gnome.Contacts.appdata.xml.in \ - org.gnome.Contacts.search-provider.ini \ - org.gnome.Contacts.SearchProvider.service.in \ - contacts.gresource.xml \ - ui/app-menu.ui \ - ui/contacts-accounts-list.ui \ - ui/contacts-address-map.ui \ - ui/contacts-avatar-dialog.ui \ - ui/contacts-contact-editor.ui \ - ui/contacts-contact-pane.ui \ - ui/contacts-in-app-notification.ui \ - ui/contacts-list-pane.ui \ - ui/contacts-window.ui \ - ui/style.css \ - $(NULL) - -CLEANFILES = \ - $(service_DATA) \ - org.gnome.Contacts.desktop \ - org.gnome.Contacts.appdata.xml \ - org.gnome.Contacts.SearchProvider.service \ - $(appdata_DATA) - -DISTCLEANFILES = \ - org.gnome.Contacts.desktop \ - org.gnome.Contacts.appdata.xml \ - org.gnome.Contacts.SearchProvider.service - - --include $(top_srcdir)/git.mk diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 8ab5941..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -icondir = $(datadir)/icons - -nobase_icon_DATA = \ - hicolor/16x16/apps/gnome-contacts.png \ - hicolor/22x22/apps/gnome-contacts.png \ - hicolor/32x32/apps/gnome-contacts.png \ - hicolor/48x48/apps/gnome-contacts.png \ - hicolor/512x512/apps/gnome-contacts.png \ - hicolor/symbolic/apps/gnome-contacts-symbolic.svg - -EXTRA_DIST = $(nobase_icon_DATA) hicolor/gnome-contacts.svg - -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 - --include $(top_srcdir)/git.mk @@ -1,400 +0,0 @@ -# git.mk, a small Makefile to autogenerate .gitignore files -# for autotools-based projects. -# -# 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: -GIT_MK_URL = https://raw.githubusercontent.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, appdata, -# appstream, hotdoc. -# -# 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)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \ - test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ - for x in \ - ar-lib \ - compile \ - config.guess \ - config.rpath \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - test-driver \ - ylwrap \ - ; do echo "$$AUX_DIR/$$x"; done` \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./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 = \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./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() may also include this, -# though it's harmless to include regardless. -GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ - if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ - for x in \ - libtool.m4 \ - ltoptions.m4 \ - ltsugar.m4 \ - ltversion.m4 \ - lt~obsolete.m4 \ - ; do echo "$$MACRO_DIR/$$x"; done; \ - fi` -# -# Modules that use gettext and use AC_CONFIG_MACRO_DIR() may also include this, -# though it's harmless to include regardless. -GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \ - `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ - if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ - for x in \ - codeset.m4 \ - extern-inline.m4 \ - fcntl-o.m4 \ - gettext.m4 \ - glibc2.m4 \ - glibc21.m4 \ - iconv.m4 \ - intdiv0.m4 \ - intl.m4 \ - intldir.m4 \ - intlmacosx.m4 \ - intmax.m4 \ - inttypes-pri.m4 \ - inttypes_h.m4 \ - lcmessage.m4 \ - lib-ld.m4 \ - lib-link.m4 \ - lib-prefix.m4 \ - lock.m4 \ - longlong.m4 \ - nls.m4 \ - po.m4 \ - printf-posix.m4 \ - progtest.m4 \ - size_max.m4 \ - stdint_h.m4 \ - threadlib.m4 \ - uintmax_t.m4 \ - visibility.m4 \ - wchar_t.m4 \ - wint_t.m4 \ - xsize.m4 \ - ; do echo "$$MACRO_DIR/$$x"; done; \ - fi` - - - -############################################################################### -# 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" - -git-mk-update: - wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk - -.PHONY: git-all git-mk-install git-mk-update - - - -############################################################################### -# 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" \ - $(REPORT_FILES) \ - $(DOC_MODULE).pdf \ - xml html \ - ; do echo "/$$x"; done; \ - FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \ - case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \ - if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \ - echo "/$(DOC_MODULE).types"; \ - fi; \ - if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \ - echo "/$(DOC_MODULE)-sections.txt"; \ - fi; \ - if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - for x in \ - $(SETUP_FILES) \ - $(DOC_MODULE).types \ - ; do echo "/$$x"; done; \ - fi; \ - 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$(HOTDOC)" = x; then :; else \ - $(foreach project, $(HOTDOC_PROJECTS),echo "/$(call HOTDOC_TARGET,$(project))"; \ - echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path output)" ; \ - echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-private-folder)" ; \ - ) \ - for x in \ - .hotdoc.d \ - ; 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 "x$(appdata_XML)" = x; then :; else \ - for x in \ - $(appdata_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(appstream_XML)" = x; then :; else \ - for x in \ - $(appstream_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - ABOUT-NLS \ - 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/stamp-po \ - 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$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = 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) \ - $(TESTS:=.test) \ - "*.gcda" \ - "*.gcno" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ - $(filter %_vala.stamp,$(DIST_COMMON)) \ - $(filter %.vapi,$(DIST_COMMON)) \ - $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo "/$$x"; done; \ - for x in \ - "*.$(OBJEXT)" \ - $(DEPDIR) \ - ; 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/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 deleted file mode 100644 index 618c1c9..0000000 --- a/m4/gtkdoc_jh_check_xml_catalog.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl Checks if a particular URI appears in the XML catalog -dnl Usage: -dnl JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -AC_DEFUN([JH_CHECK_XML_CATALOG], -[ - AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl - AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) - if $jh_found_xmlcatalog && \ - AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then - AC_MSG_RESULT([found]) - ifelse([$3],,,[$3]) - else - AC_MSG_RESULT([not found]) - ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) - fi -]) diff --git a/m4/gtkdoc_jh_path_xml_catalog.m4 b/m4/gtkdoc_jh_path_xml_catalog.m4 deleted file mode 100644 index cca2267..0000000 --- a/m4/gtkdoc_jh_path_xml_catalog.m4 +++ /dev/null @@ -1,61 +0,0 @@ -dnl Checks the location of the XML Catalog -dnl Usage: -dnl JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl Defines XMLCATALOG and XML_CATALOG_FILE substitutions -AC_DEFUN([JH_PATH_XML_CATALOG], -[ - dnl check for the presence of the XML catalog - AC_ARG_WITH([xml-catalog], - AS_HELP_STRING([--with-xml-catalog=CATALOG], - [path to xml catalog to use]),, - [with_xml_catalog='']) - AC_MSG_CHECKING([for XML catalog]) - if test -n "$with_xml_catalog"; then - dnl path was explicitly given. check that it exists. - if test -f "$with_xml_catalog"; then - jh_found_xmlcatalog=true - else - jh_found_xmlcatalog=false - fi - else - dnl if one was not explicitly specified, try some guesses - dnl we look first in /etc/xml/catalog, then XDG_DATA_DIRS/xml/catalog - if test -z "$XDG_DATA_DIRS"; then - dnl if we have no XDG_DATA_DIRS, use the default - jh_xml_catalog_searchdirs="/etc:/usr/local/share:/usr/share" - else - jh_xml_catalog_searchdirs="/etc:$XDG_DATA_DIRS" - fi - jh_found_xmlcatalog=false - dnl take care to iterate based on ':', allowing whitespace to appear in paths - jh_xml_catalog_saved_ifs="$IFS" - IFS=':' - for d in $jh_xml_catalog_searchdirs; do - if test -f "$d/xml/catalog"; then - with_xml_catalog="$d/xml/catalog" - jh_found_xmlcatalog=true - break - fi - done - IFS="$jh_xml_catalog_saved_ifs" - fi - if $jh_found_xmlcatalog; then - AC_MSG_RESULT([$with_xml_catalog]) - else - AC_MSG_RESULT([not found]) - fi - XML_CATALOG_FILE="$with_xml_catalog" - AC_SUBST([XML_CATALOG_FILE]) - - dnl check for the xmlcatalog program - AC_PATH_PROG(XMLCATALOG, xmlcatalog, no) - if test "x$XMLCATALOG" = xno; then - jh_found_xmlcatalog=false - fi - - if $jh_found_xmlcatalog; then - ifelse([$1],,[:],[$1]) - else - ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2]) - fi -]) diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 182800d..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -XSLTPROC_FLAGS = \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 - -.xml.1: - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -man_MANS = \ - gnome-contacts.1 - -xml_files = $(man_MANS:.1=.xml) - -EXTRA_DIST = $(xml_files) - -DISTCLEANFILES = $(man_MANS) - --include $(top_srcdir)/git.mk diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index f167672..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -NULL = - -AM_CPPFLAGS = \ - -include config.h \ - $(CONTACTS_CFLAGS) \ - -DLOCALEDIR=\""$(localedir)"\" \ - -DPKGDATADIR=\""$(pkgdatadir)"\" \ - -DPKGLIBDIR=\""$(pkglibdir)"\" \ - -DGNOME_DESKTOP_USE_UNSTABLE_API \ - $(NULL) - -AM_VALAFLAGS = \ - --vapidir=../vapi --pkg config --pkg custom \ - @CONTACTS_PACKAGES@ \ - --target-glib=$(GLIB_REQUIRED) --gresources=$(top_srcdir)/data/contacts.gresource.xml \ - $(NULL) - -if BUILD_CHEESE -AM_VALAFLAGS += -D HAVE_CHEESE -AM_CPPFLAGS += $(CHEESE_CFLAGS) -endif - -bin_PROGRAMS = gnome-contacts - -vala_sources = \ - contacts-app.vala \ - contacts-address-map.vala \ - contacts-contact.vala \ - contacts-contact-sheet.vala \ - contacts-contact-editor.vala \ - contacts-contact-pane.vala \ - contacts-types.vala \ - contacts-in-app-notification.vala \ - contacts-list-pane.vala \ - contacts-linked-accounts-dialog.vala \ - contacts-linking.vala \ - contacts-settings.vala \ - contacts-store.vala \ - contacts-view.vala \ - contacts-utils.vala \ - contacts-avatar-dialog.vala \ - contacts-accounts-list.vala \ - contacts-contact-frame.vala \ - contacts-window.vala \ - main.vala \ - contact-resources.c \ - $(NULL) - -gsettings_SCHEMAS = org.gnome.Contacts.gschema.xml - -@GSETTINGS_RULES@ - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data $(top_srcdir)/data/contacts.gresource.xml) -contact-resources.c: $(top_srcdir)/data/contacts.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source $< - -gnome_contacts_SOURCES = \ - $(vala_sources) \ - cc-crop-area.c \ - contacts-esd-setup.c \ - $(NULL) - -gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm - -if BUILD_CHEESE -gnome_contacts_LDADD += $(CHEESE_LIBS) -gnome_contacts_SOURCES += \ - cheese-flash.c \ - $(NULL) -endif - -libexec_PROGRAMS = gnome-contacts-search-provider - -gnome_contacts_search_provider_SOURCES = \ - contacts-contact.vala \ - contacts-esd-setup.c \ - contacts-shell-search-provider.vala \ - contacts-store.vala \ - contacts-types.vala \ - contacts-utils.vala \ - $(NULL) - -gnome_contacts_search_provider_LDADD = $(CONTACTS_LIBS) - -CLEANFILES = \ - $(vala_sources:.vala=.c) \ - *.vapi *.stamp - -EXTRA_DIST = \ - org.gnome.Contacts.gschema.xml \ - cheese-flash.h \ - cc-crop-area.h \ - contacts-esd-setup.h \ - $(NULL) - --include $(top_srcdir)/git.mk diff --git a/vapi/Makefile.am b/vapi/Makefile.am deleted file mode 100644 index 1b0b404..0000000 --- a/vapi/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_DATA = \ - cheese.vapi \ - cheese-gtk.vapi \ - config.vapi \ - custom.vapi \ - gnome-desktop-3.0.vapi - -EXTRA_DIST = $(noinst_DATA) - --include $(top_srcdir)/git.mk |