The port to Meson broke the .desktop file translations when using the autotools build system: https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030248.html Rather than spending effort on fixing the issue, let's just remove the autotools build system, since we don't really need it any more. --- .gitignore | 28 --------------- Makefile.am | 61 -------------------------------- autogen.sh | 24 ------------- bootstrap.sh | 67 ----------------------------------- configure.ac | 93 ------------------------------------------------- doc/.gitignore | 2 -- po/.gitignore | 13 ------- src/.gitignore | 2 -- src/Makefile.am | 42 ---------------------- 9 files changed, 332 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100755 bootstrap.sh delete mode 100644 configure.ac delete mode 100644 doc/.gitignore delete mode 100644 po/.gitignore delete mode 100644 src/.gitignore delete mode 100644 src/Makefile.am diff --git a/.gitignore b/.gitignore index 3aa7349..378eac2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1 @@ -ABOUT-NLS -ChangeLog -Makefile -Makefile.in -README -aclocal.m4 build -*.cache -compile -config.guess -config.h -config.h.in -*.log -config.rpath -config.status -config.sub -configure -depcomp -install-sh -intltool-extract.in -intltool-merge.in -intltool-update.in -m4/ -missing -stamp-* -*.tar.gz -.libs -.deps -*.o diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 30b014c..0000000 --- a/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# paprefs is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with paprefs. If not, see <http://www.gnu.org/licenses/>. - -EXTRA_DIST = \ - m4/ChangeLog \ - bootstrap.sh \ - README \ - LICENSE \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in - -SUBDIRS=src doc po - -MAINTAINERCLEANFILES=README -noinst_DATA = README - -README: - rm -f README - $(MAKE) -C doc README - cd $(srcdir) && ln -s doc/README README - -homepage: all dist - test -d $$HOME/homepage/private - mkdir -p $$HOME/homepage/private/projects/paprefs - cp paprefs- at PACKAGE_VERSION@xxxxxxx $$HOME/homepage/private/projects/paprefs - cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/paprefs - ln -sf README.html $$HOME/homepage/private/projects/paprefs/index.html - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - -fedora-snapshot: dist - cp $(distdir).tar.gz $$HOME/cvs.fedora/paprefs/devel/$(distdir).svn`date +%Y%m%d`.tar.gz - -.PHONY: homepage - -ACLOCAL_AMFLAGS = -I m4 - -dist-hook: - if test -d .git ; then \ - git pull ; \ - chmod u+w ${distdir}/ChangeLog || true ; \ - git-changelog.perl > ${distdir}/ChangeLog ; \ - fi diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 1c7e9d4..0000000 --- a/autogen.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# $Id$ - -# This file is part of paprefs. -# -# paprefs is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# paprefs is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with paprefs; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -# Only there to make jhbuild happy - -NOCONFIGURE=1 ./bootstrap.sh - -exec ./configure "$@" diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100755 index 9dbf868..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# paprefs is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with paprefs. If not, see <http://www.gnu.org/licenses/>. - -VERSION=1.9 - -run_versioned() { - local P - local V - - V=$(echo "$2" | sed -e 's,\.,,g') - - if [ -e "`which $1$V 2> /dev/null`" ] ; then - P="$1$V" - else - if [ -e "`which $1-$2 2> /dev/null`" ] ; then - P="$1-$2" - else - P="$1" - fi - fi - - shift 2 - "$P" "$@" -} - -set -ex - -if [ "x$1" = "xam" ] ; then - run_versioned automake "$VERSION" -a -c --foreign - ./config.status -else - rm -rf autom4te.cache - rm -f config.cache - - rm -f Makefile.am~ configure.ac~ - # Evil, evil, evil, evil hack - sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force - test -f Makefile.am~ && mv Makefile.am~ Makefile.am - test -f configure.ac~ && mv configure.ac~ configure.ac - - intltoolize --copy --force --automake - run_versioned aclocal "$VERSION" -I m4 - run_versioned autoconf 2.59 -Wall - run_versioned autoheader 2.59 - run_versioned automake "$VERSION" -a -c --foreign - - if test "x$NOCONFIGURE" = "x"; then - CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" - make clean - fi -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 1d38d41..0000000 --- a/configure.ac +++ /dev/null @@ -1,93 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# paprefs is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with paprefs. If not, see <http://www.gnu.org/licenses/>. - -AC_PREREQ(2.57) -AC_INIT([paprefs],[0.9.10],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org]) -AC_CONFIG_SRCDIR([src/paprefs.cc]) -AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall dist-xz tar-ustar]) - -AC_SUBST(PACKAGE_URL, [http://freedesktop.org/software/pulseaudio/paprefs/]) - -if type -p stow > /dev/null && test -d /usr/local/stow ; then - AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) - ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" -fi - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AC_PROG_LN_S -AC_TYPE_SIGNAL -AC_HEADER_STDC - -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 sigc++-2.0 dbus-glib-1]) -AC_SUBST(GUILIBS_CFLAGS) -AC_SUBST(GUILIBS_LIBS) - -PKG_CHECK_MODULES(LIBPULSE, libpulse) -LIBPULSE_MODLIBEXECDIR=`pkg-config libpulse --variable modlibexecdir` -AC_SUBST(LIBPULSE_MODLIBEXECDIR) - -# If using GCC specifiy some additional parameters -if test "x$GCC" = "xyes" ; then - CFLAGS="$CFLAGS -pipe -Wall -W -Wno-unused-parameter" - CXXFLAGS="$CXXFLAGS -pipe -Wall -W" -fi - -# LYNX documentation generation -AC_ARG_ENABLE(lynx, - AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation), -[case "${enableval}" in - yes) lynx=yes ;; - no) lynx=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; -esac],[lynx=yes]) - -if test x$lynx = xyes ; then - AC_CHECK_PROG(have_lynx, lynx, yes, no) - - if test x$have_lynx = xno ; then - AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***]) - fi -fi - -AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) - -#### GSettings support #### -PKG_CHECK_MODULES(GSETTINGS, [ giomm-2.4 >= 2.26 ]) -GLIB_GSETTINGS - -AM_GNU_GETTEXT([external]) - -IT_PROG_INTLTOOL([0.35.0]) -GETTEXT_PACKAGE=paprefs -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -AM_GLIB_GNU_GETTEXT - -AC_CONFIG_FILES([ -po/Makefile.in -Makefile -src/Makefile -doc/Makefile -doc/README.html]) - -AC_OUTPUT diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index bc63974..0000000 --- a/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -README -README.html diff --git a/po/.gitignore b/po/.gitignore deleted file mode 100644 index 1ef74c7..0000000 --- a/po/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.*-cache -*~ -Makefile.in.in -Makevars.template -POTFILES -Rules-quot -boldquot.sed -*.gmo -en at boldquot.header -en at quot.header -insert-header.sin -quot.sed -remove-potcdate.sin diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index bd449b8..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -paprefs -paprefs.desktop diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index e50c3a8..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# paprefs is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with paprefs. If not, see <http://www.gnu.org/licenses/>. - -# Needs fixing on some borked OS -SHREXT=.so - -desktopdir = $(datadir)/applications -gladedir = $(pkgdatadir) -localedir = $(datadir)/locale - -bin_PROGRAMS=paprefs -glade_DATA=paprefs.glade -desktop_in_files=paprefs.desktop.in -desktop_DATA=$(desktop_in_files:.desktop.in=.desktop) - -paprefs_SOURCES=paprefs.cc - -paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(LIBPULSE_LIBS) -paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(LIBPULSE_CFLAGS) $(GSETTINGS_CFLAGS) -paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODDIR=\""$(LIBPULSE_MODLIBEXECDIR)"\" -DSHREXT=\"$(SHREXT)\" - - at GSETTINGS_RULES@ - -EXTRA_DIST = $(glade_DATA) $(desktop_in_files) - -CLEANFILES = $(desktop_DATA) - - at INTLTOOL_DESKTOP_RULE@ -- 2.18.0
