From 73625233f64c3832e49ea5ec02bc44d3aa2bfbcd Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 5 Feb 2020 15:04:05 +0100 Subject: [PATCH] build: Remove autotools support --- .gitignore | 36 ------ .gitlab-ci.yml | 4 +- Makefile.am | 29 ----- acinclude.m4 | 182 ------------------------------ autogen.sh | 22 ---- configure.ac | 97 ---------------- data/Makefile.am | 47 -------- doc/Makefile.am | 81 -------------- doc/dbus/Makefile.am | 15 --- git.mk | 196 --------------------------------- pam/Makefile.am | 13 --- src/Makefile.am | 54 --------- tests/Makefile.am | 12 -- tests/pam/Makefile.am | 6 - tests/pam/services/Makefile.am | 7 -- utils/Makefile.am | 35 ------ 16 files changed, 2 insertions(+), 834 deletions(-) delete mode 100644 Makefile.am delete mode 100644 acinclude.m4 delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 doc/Makefile.am delete mode 100644 doc/dbus/Makefile.am delete mode 100644 git.mk delete mode 100644 pam/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 tests/Makefile.am delete mode 100644 tests/pam/Makefile.am delete mode 100644 tests/pam/services/Makefile.am delete mode 100644 utils/Makefile.am diff --git a/.gitignore b/.gitignore index 1765692..3a53be3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,11 @@ /*.bak -/*.lo /*.o /*.orig /*.rej /*.tab.c /*~ /.*.sw[nop] -/.deps /.dirstamp /.gitignore -/.libs -/GPATH -/GRTAGS -/GSYMS -/GTAGS -/ID -/Makefile -/Makefile.in -/TAGS /_build -/_libs -/autom4te.cache -/config.cache -/config.h -/config.log -/config.lt -/config.status -/config.status.lineno -/configure -/configure.lineno -/intltool-extract.in -/intltool-merge.in -/intltool-update.in -/libtool -/po/*.gmo -/po/*.mo -/po/.intltool-merge-cache -/po/Makefile -/po/Makefile.in -/po/Makefile.in.in -/po/POTFILES -/po/fprintd.pot -/po/stamp-it -/so_locations -/stamp-h1 /tags diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5eab1ce..7393589 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,8 @@ image: fedora:rawhide variables: DEPENDENCIES: dbus-glib-devel pam-devel polkit-devel - gtk-doc meson gettext gcovr intltool autoconf automake libtool - gcc gcc-c++ glibc-devel make python3-dbusmock python3-libpamtest systemd-devel + gtk-doc meson gettext gcovr + gcc gcc-c++ glibc-devel python3-dbusmock python3-libpamtest systemd-devel DEPENDENCIES_STABLE: $DEPENDENCIES libfprint-devel DEPENDENCIES_DEV: $DEPENDENCIES git # Sync'ed up with https://gitlab.freedesktop.org/libfprint/libfprint/blob/master/.gitlab-ci.yml diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 9abc242..0000000 --- a/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -AUTOMAKE_OPTIONS = dist-bzip2 -SUBDIRS = src data utils pam doc tests po -EXTRA_DIST = TODO intltool-extract.in intltool-merge.in intltool-update.in - -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-systemdsystemunitdir='$${libdir}/systemd/system-distcheck' - -all: check create-pot - -check: check-translations - -create-pot: - $(MAKE) -C po fprintd.pot - -check-translations: - @for i in $(top_srcdir)/po/*.po ; do \ - if ! grep -q `basename $$i | sed 's,.po,,'` $(top_srcdir)/po/LINGUAS ; then \ - echo '**********************************'; \ - echo '***' `basename $$i | sed 's,.po,,'` missing from po/LINGUAS '***' ; \ - echo '**********************************'; \ - exit 1; \ - fi; \ - done; - -update-translations: create-pot check-translations - @tx -r $(srcdir) pull --all --force --skip - @if [ ! -d .tx ] ; then mkdir .tx ; fi ; if [ x$(srcdir) != x$(builddir) ] ; then cp -f $(srcdir)/.tx/config .tx/ ; fi - @tx push --source - --include $(top_srcdir)/git.mk diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 88d0879..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,182 +0,0 @@ -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl -dnl example -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var"="x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) - - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 9307ca2..0000000 --- a/autogen.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -olddir=`pwd` -cd "$srcdir" - -aclocal || exit 1 -autoheader || exit 1 -glib-gettextize -f -c || exit 1 -gtkdocize --copy || exit 1 -intltoolize -c -f || exit 1 -libtoolize -c || exit 1 -autoconf || exit 1 -automake -a -c || exit 1 - -cd "$olddir" - -if test -z "$NOCONFIGURE"; then - $srcdir/configure --enable-maintainer-mode $* -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 4922abd..0000000 --- a/configure.ac +++ /dev/null @@ -1,97 +0,0 @@ -AC_INIT([fprintd], [1.90.0]) -AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip check-news]) -AC_CONFIG_SRCDIR([src/main.c]) -AC_CONFIG_HEADERS([config.h]) - -# Enable silent build when available (Automake 1.11) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_PREREQ([2.50]) -AC_PROG_LIBTOOL -AC_PROG_CC -AM_PROG_CC_C_O - -GETTEXT_PACKAGE=fprintd -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name]) -AC_SUBST(GETTEXT_PACKAGE) -AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.35.0]) - -PKG_CHECK_MODULES(FPRINT, [libfprint-2 >= 1.90.0]) -AC_SUBST(FPRINT_LIBS) -AC_SUBST(FPRINT_CFLAGS) - -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.56 dbus-glib-1) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) - -PKG_CHECK_MODULES(PAM_MODULE, libsystemd) -AC_SUBST(PAM_MODULE_CFLAGS) -AC_SUBST(PAM_MODULE_LIBS) - -PKG_CHECK_MODULES(DAEMON, glib-2.0 dbus-glib-1 gmodule-2.0 polkit-gobject-1 >= 0.91 gio-2.0) -AC_SUBST(DAEMON_LIBS) -AC_SUBST(DAEMON_CFLAGS) - -AC_ARG_ENABLE(pam, AC_HELP_STRING([--enable-pam],[Build the fprintd PAM module]), enable_pam="$enableval", enable_pam=yes) -has_pam=no -if test x$enable_pam = xyes; then - has_pam=yes - AC_CHECK_HEADER([security/pam_modules.h], [has_pam=yes] , [has_pam=no]) - if test x$has_pam = xyes; then - has_pam=no - AC_CHECK_LIB(pam, pam_start, [PAM_LIBS="-lpam" - has_pam=yes], - has_pam=no) - fi - AC_SUBST(PAM_LIBS) -fi -AM_CONDITIONAL(HAVE_PAM, test "x$has_pam" = "xyes") - -AC_MSG_CHECKING(for PAM headers and library) -AC_MSG_RESULT([$has_pam]) - - -AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) -AC_CHECK_PROG([XSLTPROC], [xsltproc], [xsltproc]) -AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man]) -AM_CONDITIONAL(BUILD_MAN, test x"$POD2MAN" != "x") - -GTK_DOC_CHECK([1.3]) - -AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], - [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ - # StateDirectory was introduced in systemd 235 - PKG_CHECK_MODULES(SYSTEMD, systemd >= 235) - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -]) -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) - -AS_AC_EXPAND(DATADIR, $datadir) - -DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" -AC_SUBST(DBUS_SERVICES_DIR) -AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) - -AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR", [Where the configuration file will be located]) - -GNOME_COMPILE_WARNINGS - -AC_OUTPUT([ -Makefile -src/Makefile -data/Makefile -utils/Makefile -pam/Makefile -doc/Makefile -doc/version.xml -doc/dbus/Makefile -tests/Makefile -tests/pam/Makefile -tests/pam/services/Makefile -po/Makefile.in -]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 9e19fbe..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ - -dbus_servicesdir = $(datadir)/dbus-1/system-services -dbus_services_in_files = net.reactivated.Fprint.service.in -dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) - -$(dbus_services_DATA): $(dbus_services_in_files) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ - -dbus_confdir = $(datadir)/dbus-1/system.d -dbus_conf_DATA = net.reactivated.Fprint.conf - -systemdservice_in_files = fprintd.service.in - -if HAVE_SYSTEMD -systemdservicedir = $(systemdsystemunitdir) -systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) -$(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -endif - -polkitdir = $(datadir)/polkit-1/actions -polkit_in_files = net.reactivated.fprint.device.policy.in - -@INTLTOOL_POLICY_RULE@ -polkit_DATA = $(polkit_in_files:.policy.in=.policy) - -confdir = $(sysconfdir)/ -conf_DATA = fprintd.conf - -man_MANS = - -if BUILD_MAN -man_MANS += fprintd.1 pam_fprintd.8 -fprintd.1: fprintd.pod - $(AM_V_GEN) pod2man -c "" -s 1 -q none -n fprintd -r freedesktop $< > $@ - -pam_fprintd.8: pam_fprintd.pod - $(AM_V_GEN) pod2man -c "" -s 8 -q none -n pam_fprintd -r freedesktop $< > $@ -endif - -EXTRA_DIST = $(dbus_services_in_files) $(dbus_conf_DATA) $(polkit_in_files) $(conf_DATA) $(systemdservice_in_files) fprintd.pod pam_fprintd.pod -CLEANFILES = $(polkit_DATA) $(dbus_services_DATA) $(systemdservice_DATA) fprintd.1 pam_fprintd.8 - -check: - @$(XMLLINT) --noout $(polkit_DATA) - - diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 6c2d0f8..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ - -SUBDIRS = dbus - -NULL = - -AUTOMAKE_OPTIONS = 1.7 - -# The name of the module. -DOC_MODULE=fprintd - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=fprintd-docs.xml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--ignore-headers=config.h - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=../src - -# Used for dependencies -HFILE_GLOB= -#$(top_srcdir)/policy/*.h -CFILE_GLOB= -#$(top_srcdir)/policy/*.c - -# Headers to ignore -IGNORE_HFILES= \ - $(NULL) - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -INCLUDES = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src \ - $(NULL) - -GTKDOC_LIBS = \ - $(GLIB_LIBS) \ - $(top_builddir)/src/libfprintd.la \ - $(NULL) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -MKTMPL_OPTIONS= - -# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -content_files = \ - version.xml \ - dbus/net.reactivated.Fprint.Manager.ref.xml \ - dbus/net.reactivated.Fprint.Device.ref.xml \ - $(NULL) - -# Images to copy into HTML directory -HTML_IMAGES = \ - $(NULL) - -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= - -DISTCLEANFILES = \ - net.reactivated.Fprint.Manager.ref.xml \ - net.reactivated.Fprint.Device.ref.xml - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in \ - fprintd.types \ - fprintd-*.txt \ - $(NULL) - -if ENABLE_GTK_DOC -include $(top_srcdir)/gtk-doc.make -else -EXTRA_DIST = fprintd-docs.xml -endif - -# Version information for marking the documentation -EXTRA_DIST += version.xml.in - diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am deleted file mode 100644 index aa606b4..0000000 --- a/doc/dbus/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -noinst_DATA = net.reactivated.Fprint.Manager.ref.xml net.reactivated.Fprint.Device.ref.xml - -net.reactivated.Fprint.Manager.ref.xml : $(top_srcdir)/src/manager.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl - echo """" > $@ - $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -net.reactivated.Fprint.Device.ref.xml : $(top_srcdir)/src/device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl - echo """" > $@ - $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd - -clean-local : - rm -f *~ *.ref.xml diff --git a/git.mk b/git.mk deleted file mode 100644 index f244116..0000000 --- a/git.mk +++ /dev/null @@ -1,196 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Written by Behdad Esfahbod -# -# 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. -# -# The canonical source for this file is pango/git.mk, or whereever the -# header of pango/git.mk suggests in the future. -# -# 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. -# -# 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. -# -# 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. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# pango/Makefile.am. -# -# 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, intltool, GSettings. -# -# -# 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. -# - -git-all: git-mk-install - -git-mk-install: - @echo Installing git makefile - @any_failed=; find $(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 - - -### .gitignore generation - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - $(AM_V_GEN) \ - { \ - 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)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for x in \ - $(_DOC_C_DOCS) \ - $(_DOC_LC_DOCS) \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_POFILES) \ - $(_DOC_MOFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; 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 \ - po/Makefile \ - po/POTFILES \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.mo" \ - 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; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) \ - $(check_PROGRAMS) \ - $(EXTRA_PROGRAMS) \ - $(LTLIBRARIES) \ - so_locations \ - .libs _libs \ - $(MOSTLYCLEANFILES) \ - "*.$(OBJEXT)" \ - "*.lo" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(DEPDIR) \ - 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-recurse-maybe: - @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ - fi; -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore: $(srcdir)/.gitignore gitignore-recurse - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/pam/Makefile.am b/pam/Makefile.am deleted file mode 100644 index af57d17..0000000 --- a/pam/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -if HAVE_PAM - -pammod_LTLIBRARIES = pam_fprintd.la -pammoddir=$(libdir)/security - -pam_fprintd_la_SOURCES = pam_fprintd.c -pam_fprintd_la_CFLAGS = -fPIC $(WARN_CFLAGS) $(PAM_MODULE_CFLAGS) -DLOCALEDIR="\"$(localedir)\"" -pam_fprintd_la_LDFLAGS = -avoid-version -module -pam_fprintd_la_LIBADD = $(PAM_LIBS) $(PAM_MODULE_LIBS) - -endif - -EXTRA_DIST = pam_fprintd.c fingerprint-strings.h diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index f0cb3dd..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -BUILT_SOURCES = manager-dbus-glue.h device-dbus-glue.h $(MARSHALFILES) $(interfaces_DATA) -noinst_HEADERS = $(BUILT_SOURCES) - -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = manager.xml device.xml fprintd-marshal.list - -libexec_PROGRAMS = fprintd -noinst_LTLIBRARIES = libfprintd.la - -AM_CFLAGS = \ - $(WARN_CFLAGS) \ - $(FPRINT_CFLAGS) \ - $(DAEMON_CFLAGS) \ - -DG_LOG_DOMAIN=\""fprintd"\" \ - -DLOCALEDIR=\""$(datadir)/locale"\" \ - -DPLUGINDIR=\""$(libdir)/fprintd/modules"\" - -libfprintd_la_SOURCES = \ - manager.c device.c \ - $(MARSHALFILES) \ - fprintd.h -libfprintd_la_LIBADD = $(FPRINT_LIBS) $(DAEMON_LIBS) -libfprintd_la_LDFLAGS = -no-undefined - -fprintd_SOURCES = \ - main.c \ - file_storage.c file_storage.h storage.h -fprintd_LDADD = libfprintd.la - -interfaces_DATA = net.reactivated.Fprint.Manager.xml net.reactivated.Fprint.Device.xml -net.reactivated.Fprint.Manager.xml: manager.xml - cat $< > $@ -net.reactivated.Fprint.Device.xml: device.xml - cat $< > $@ -interfacesdir = $(datadir)/dbus-1/interfaces/ - -manager-dbus-glue.h: manager.xml - dbus-binding-tool --prefix=fprint_manager --mode=glib-server $< --output=$@ - -device-dbus-glue.h: device.xml - dbus-binding-tool --prefix=fprint_device --mode=glib-server $< --output=$@ - -MARSHALFILES = fprintd-marshal.c fprintd-marshal.h -GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` - -fprintd-marshal.h: fprintd-marshal.list - ( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(srcdir)/fprintd-marshal.list --header > fprintd-marshal.h ) -fprintd-marshal.c: fprintd-marshal.h - ( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(srcdir)/fprintd-marshal.list --body --header > fprintd-marshal.c ) - -install-data-hook: - if test -w $(DESTDIR)$(prefix)/; then \ - mkdir -p $(DESTDIR)$(localstatedir)/lib/fprint; \ - fi diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 3c9f3f5..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = pam - -TESTS_ENVIRONMENT = export FPRINT_BUILD_DIR=$(abs_top_builddir)/src; export TOPSRCDIR=$(abs_top_srcdir); export PYTHON=@PYTHON@; -TESTS = fprintd.py test_fprintd_utils.py - -EXTRA_DIST = \ - $(TESTS) \ - dbusmock/fprintd.py \ - prints/README \ - prints/*.png \ - prints/*.jpg - diff --git a/tests/pam/Makefile.am b/tests/pam/Makefile.am deleted file mode 100644 index 3bf9597..0000000 --- a/tests/pam/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIRS = services - -TESTS_ENVIRONMENT = export TOPBUILDDIR=$(abs_top_builddir); export TOPSRCDIR=$(abs_top_srcdir); export LD_PRELOAD=libpam_wrapper.so; export PAM_WRAPPER_SERVICE_DIR=$(abs_top_builddir)/tests/pam/services; export PAM_WRAPPER=1; export PYTHON=@PYTHON@; export G_DEBUG=fatal_warnings; -TESTS = test_pam_fprintd.py - -EXTRA_DIST = $(TESTS) diff --git a/tests/pam/services/Makefile.am b/tests/pam/services/Makefile.am deleted file mode 100644 index 8477efb..0000000 --- a/tests/pam/services/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -all-am: fprintd-pam-test - -fprintd-pam-test: fprintd-pam-test.in Makefile - sed -e "s|\@FPRINTDPAMPATH\@|$(abs_top_builddir)/pam/.libs/pam_fprintd.so|" $< > $@ - -EXTRA_DIST = fprintd-pam-test.in -CLEANFILES = fprintd-pam-test diff --git a/utils/Makefile.am b/utils/Makefile.am deleted file mode 100644 index 01e2184..0000000 --- a/utils/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -BUILT_SOURCES = manager-dbus-glue.h device-dbus-glue.h $(MARSHALFILES) -noinst_HEADERS = $(BUILT_SOURCES) -CLEANFILES = $(BUILT_SOURCES) - -bin_PROGRAMS = fprintd-verify fprintd-enroll fprintd-list fprintd-delete - -fprintd_verify_SOURCES = verify.c $(MARSHALFILES) -fprintd_verify_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) -fprintd_verify_LDADD = $(GLIB_LIBS) - -fprintd_enroll_SOURCES = enroll.c $(MARSHALFILES) -fprintd_enroll_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/pam -fprintd_enroll_LDADD = $(GLIB_LIBS) - -fprintd_list_SOURCES = list.c -fprintd_list_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) -fprintd_list_LDADD = $(GLIB_LIBS) - -fprintd_delete_SOURCES = delete.c -fprintd_delete_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) -fprintd_delete_LDADD = $(GLIB_LIBS) - -manager-dbus-glue.h: ../src/manager.xml - dbus-binding-tool --prefix=fprint_manager --mode=glib-client $< --output=$@ - -device-dbus-glue.h: ../src/device.xml - dbus-binding-tool --prefix=fprint_device --mode=glib-client $< --output=$@ - -MARSHALFILES = marshal.c marshal.h -GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` - -marshal.h: $(top_srcdir)/src/fprintd-marshal.list - ( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(top_srcdir)/src/fprintd-marshal.list --header > marshal.h ) -marshal.c: marshal.h - ( $(GLIB_GENMARSHAL) --prefix=fprintd_marshal $(top_srcdir)/src/fprintd-marshal.list --body --header > marshal.c )