Updating branch refs/heads/master to 4f1e62309cf996f8a593438fa9edc6afa6d7b522 (commit) from f9ca75a7dedad8eaef97c0a1a11d397664bae78a (commit)
commit 4f1e62309cf996f8a593438fa9edc6afa6d7b522 Author: Guido Berhoerster <guido+x...@berhoerster.name> Date: Thu Sep 27 16:31:03 2012 +0200 Modernize build system and build panel plugin as a module Modernize configure.in.in and rename to configure.ac.in. Require a C99 capable compiler. Build the plugin as a module. Remove unnecessary trickery with desktop file substitutions. Remove HACKING, THANKS, TODO and add INSTALL file. Fix dummy ChangeLog generation. AUTHORS | 1 + INSTALL | 365 ++++++++++++++++++++ Makefile.am | 19 +- NEWS | 1 + TODO | 9 - autogen.sh | 30 ++- configure.in.in => configure.ac.in | 24 +- panel-plugin/Makefile.am | 42 +-- ...mixer-plugin.desktop.in.in => mixer.desktop.in} | 3 +- panel-plugin/xfce-mixer-plugin.c | 2 +- po/POTFILES.in | 4 +- xfce4-mixer/Makefile.am | 19 +- ...-mixer.desktop.in.in => xfce4-mixer.desktop.in} | 0 13 files changed, 442 insertions(+), 77 deletions(-) diff --git a/AUTHORS b/AUTHORS index c40ddc1..14d2553 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ Jannis Pohlmann <jan...@xfce.org> +Guido Berhoerster <guido+x...@berhoerster.name> diff --git a/HACKING b/HACKING deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..81fd332 --- /dev/null +++ b/INSTALL @@ -0,0 +1,365 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + + 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 warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am index ef3a48a..a752851 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,18 +31,18 @@ AUTOMAKE_OPTIONS = \ dist-bzip2 distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ ChangeLog .PHONY: ChangeLog ChangeLog: Makefile - (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ - && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ - || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) + $(AM_V_GEN) if GIT_DIR=$(top_srcdir)/.git git log >$@.tmp; then \ + mv $@.tmp $@; \ + else \ + rm -f $@.tmp; \ + touch $@; \ + echo 'Could not generate ChangeLog from git: installing possibly empty changelog.' >&2; \ + fi dist-hook: ChangeLog @@ -50,12 +50,9 @@ EXTRA_DIST = \ AUTHORS \ ChangeLog \ COPYING \ - HACKING \ INSTALL \ NEWS \ README \ - THANKS \ - TODO \ intltool-extract.in \ intltool-merge.in \ intltool-update.in diff --git a/NEWS b/NEWS index 7bdbf49..6d0998c 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ - Fix a potential NULL pointer dereference. - Do not try to destroy the mixer window twice after a delete-event (bug #8288). +- Modernize build system and build panel plugin as a module. 4.8.0 diff --git a/THANKS b/THANKS deleted file mode 100644 index e69de29..0000000 diff --git a/TODO b/TODO deleted file mode 100644 index cbcd441..0000000 --- a/TODO +++ /dev/null @@ -1,9 +0,0 @@ -* Improve the naming of the volume stock icons. - -* Improve the plugin icons. - -* Panel plugin: Decide on how to react on tracks with - different channel volume levels (median, minimum, maximum value?) - -* Allow changing controls from the console, probably via something like: - --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE diff --git a/autogen.sh b/autogen.sh index 2c644e9..ae2cb53 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,6 +3,7 @@ # vi:set et ai sw=2 sts=2 ts=2: */ #- # Copyright (c) 2009 Jannis Pohlmann <jan...@xfce.org> +# Copyright (c) 2012 Guido Berhoerster <guido+x...@berhoerster.name> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -19,7 +20,32 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -(type xdt-autogen) >/dev/null 2>&1 || { +# finds the given command in $PATH +findpath () { + if [ $# -ne 1 ] || [ -z "$1" ]; then + return 1 + fi + + _findpath_cmd="$1" + oIFS="${IFS}" + IFS=: + set -- ${PATH} + IFS="${oIFS}" + + while [ $# -gt 0 ]; do + if [ -x "$1/${_findpath_cmd}" ]; then + printf "%s\n" "$1/${_findpath_cmd}" + unset _findpath_cmd oIFS + return 0 + fi + shift + done + + unset _findpath_cmd oIFS + return 1 +} + +xdt_autogen="$(findpath xdt-autogen)" || { cat >&2 <<EOF autogen.sh: You don't seem to have the Xfce development tools installed on your system, which are required to build this software. @@ -29,4 +55,4 @@ EOF exit 1 } -XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@ +XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec "${xdt_autogen}" "$@" diff --git a/configure.in.in b/configure.ac.in similarity index 90% rename from configure.in.in rename to configure.ac.in index e043134..6f1ea84 100644 --- a/configure.in.in +++ b/configure.ac.in @@ -1,6 +1,7 @@ # vi:set et ai sw=2 sts=2 ts=2: */ #- # Copyright (c) 2008-2011 Jannis Pohlmann <jan...@xfce.org> +# Copyright (c) 2012 Guido Berhoerster <guido+x...@berhoerster.name> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -26,25 +27,25 @@ m4_define([xfce4_mixer_version_micro], [0]) m4_define([xfce4_mixer_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_mixer_version_build], [r@REVISION@]) m4_define([xfce4_mixer_version_tag], [git]) -m4_define([xfce4_mixer_version], [xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(), [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [svn], [xfce4_mixer_version_tag()-xfce4_mixer_version_build()], [xfce4_mixer_version_tag()])]) +m4_define([xfce4_mixer_version], [xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(), [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [git], [xfce4_mixer_version_tag()-xfce4_mixer_version_build()], [xfce4_mixer_version_tag()])]) dnl ******************************************* -dnl *** Debugging support for SVN snapshots *** +dnl *** Debugging support for git snapshots *** dnl ******************************************* -m4_define([mixer_debug_default], [ifelse(xfce4_mixer_version_tag(), [svn], [full], [minimum])]) +m4_define([mixer_debug_default], [ifelse(xfce4_mixer_version_tag(), [git], [full], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2008-2011 Jannis Pohlmann <jan...@xfce.org>.]) +AC_COPYRIGHT([Copyright (c) 2008-2011 Jannis Pohlmann <jan...@xfce.org>. +Copyright (c) 2012 Guido Berhoerster <guido+x...@berhoerster.name>.]) AC_INIT([xfce4-mixer], [xfce4_mixer_version], [http://bugzilla.xfce.org/], [xfce4-mixer]) -AC_REVISION([$Id$]) -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) dnl *************************** dnl *** Initialize automake *** dnl *************************** -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) +AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 silent-rules tar-ustar]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() @@ -52,7 +53,6 @@ dnl ******************************* dnl *** Check for UNIX variants *** dnl ******************************* AC_AIX() -AC_ISC_POSIX() AC_MINIX() dnl ******************************** @@ -60,6 +60,10 @@ dnl *** Check for basic programs *** dnl ******************************** AC_PROG_CC() AM_PROG_CC_C_O() +AC_PROG_CC_C99() +if test "x$ac_cv_prog_cc_c99" = xno; then + AC_MSG_ERROR([$CC does not accept ISO C99]) +fi AC_PROG_LD() AC_PROG_INSTALL() AC_PROG_INTLTOOL() @@ -67,8 +71,8 @@ AC_PROG_INTLTOOL() dnl ************************** dnl *** Initialize libtool *** dnl ************************** -AC_DISABLE_STATIC() -AC_PROG_LIBTOOL() +LT_PREREQ([2.4]) +LT_INIT([disable-static]) dnl ********************************** dnl *** Check for standard headers *** diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 358ea44..2d2bcbd 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,20 +1,17 @@ -# $Id$ -# # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: -plugindir = $(libexecdir)/xfce4/panel-plugins +plugindir = $(libdir)/xfce4/panel/plugins -plugin_PROGRAMS = \ - xfce4-mixer-plugin +plugin_LTLIBRARIES = libmixer.la -xfce4_mixer_plugin_SOURCES = \ +libmixer_la_SOURCES = \ xfce-plugin-dialog.h \ xfce-plugin-dialog.c \ xfce-volume-button.h \ xfce-volume-button.c \ xfce-mixer-plugin.c -xfce4_mixer_plugin_CFLAGS = \ +libmixer_la_CFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DDATADIR=\"$(datadir)\" \ @@ -28,12 +25,18 @@ xfce4_mixer_plugin_CFLAGS = \ $(LIBXFCE4PANEL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) -xfce4_mixer_plugin_DEPENDENCIES = \ +libmixer_la_DEPENDENCIES = \ $(top_builddir)/libxfce4mixer/libxfce4mixer.la -xfce4_mixer_plugin_LDFLAGS = \ +libmixer_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ $(top_builddir)/libxfce4mixer/libxfce4mixer.la \ - $(PLATFORM_LDFLAGS) \ + $(PLATFORM_LDFLAGS) + +libmixer_la_LIBADD = \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ @@ -43,26 +46,15 @@ xfce4_mixer_plugin_LDFLAGS = \ -lgstaudio-0.10 \ -lgstinterfaces-0.10 -desktopdir = \ - $(datadir)/xfce4/panel-plugins - -desktop_in_in_files = \ - xfce4-mixer-plugin.desktop.in.in - -desktop_in_files = \ - $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktopdir = $(datadir)/xfce4/panel/plugins -%.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ +desktop_in_files = mixer.desktop.in desktop_DATA = \ $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -EXTRA_DIST = \ - $(desktop_in_in_files) +EXTRA_DIST = $(desktop_in_files) -CLEANFILES = \ - $(desktop_in_files) \ - $(desktop_DATA) +CLEANFILES = $(desktop_DATA) diff --git a/panel-plugin/xfce4-mixer-plugin.desktop.in.in b/panel-plugin/mixer.desktop.in similarity index 69% rename from panel-plugin/xfce4-mixer-plugin.desktop.in.in rename to panel-plugin/mixer.desktop.in index e228c05..fb46a41 100644 --- a/panel-plugin/xfce4-mixer-plugin.desktop.in.in +++ b/panel-plugin/mixer.desktop.in @@ -3,5 +3,6 @@ Type=X-XFCE-PanelPlugin _Name=Mixer _Comment=Volume control for your sound card Icon=multimedia-volume-control -X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-mixer-plugin +X-XFCE-Internal=false +X-XFCE-Module=mixer X-XFCE-Unique=false diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c index d56d43f..e2470a0 100644 --- a/panel-plugin/xfce-mixer-plugin.c +++ b/panel-plugin/xfce-mixer-plugin.c @@ -113,7 +113,7 @@ static void xfce_mixer_plugin_set_command (XfceMixerPlugin *m /* Register the plugin */ -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (xfce_mixer_plugin_construct); +XFCE_PANEL_PLUGIN_REGISTER (xfce_mixer_plugin_construct); diff --git a/po/POTFILES.in b/po/POTFILES.in index c95053f..0a7c7c3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,7 +3,7 @@ panel-plugin/xfce-plugin-dialog.c panel-plugin/xfce-volume-button.c panel-plugin/xfce-plugin-dialog.h panel-plugin/xfce-volume-button.h -panel-plugin/xfce4-mixer-plugin.desktop.in.in +panel-plugin/mixer.desktop.in libxfce4mixer/libxfce4mixer.c libxfce4mixer/xfce-mixer-card-combo.c libxfce4mixer/xfce-mixer-preferences.c @@ -26,4 +26,4 @@ xfce4-mixer/xfce-mixer-option.h xfce4-mixer/xfce-mixer-switch.h xfce4-mixer/xfce-mixer-track.h xfce4-mixer/xfce-mixer-window.h -xfce4-mixer/xfce4-mixer.desktop.in.in +xfce4-mixer/xfce4-mixer.desktop.in diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am index a869325..fd17aeb 100644 --- a/xfce4-mixer/Makefile.am +++ b/xfce4-mixer/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: bin_PROGRAMS = \ @@ -47,26 +46,14 @@ xfce4_mixer_LDFLAGS = \ -lgstaudio-0.10 \ -lgstinterfaces-0.10 -# .desktop file -# -# Some automake trickery here. Because we cannot use $(libexecdir) in the -# automake stage, we'll use sed to get the full path into the .desktop file. -# We also need to let intltool merge the translated fields, so we add an -# additional level of indirection: a <name>.desktop.in.in file. -# -desktop_in_in_files = xfce4-mixer.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktop_in_files = xfce4-mixer.desktop.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ - $(desktop_in_in_files) + $(desktop_in_files) DISTCLEANFILES = \ - $(desktop_DATA) $(desktop_in_files) + $(desktop_DATA) -# Get full path into .desktop file -%.desktop.in: %.desktop.in.in - sed -e "s^@PLUGIN_PATH@^$(libexecdir)/applications^" \ - $< > $@ diff --git a/xfce4-mixer/xfce4-mixer.desktop.in.in b/xfce4-mixer/xfce4-mixer.desktop.in similarity index 100% rename from xfce4-mixer/xfce4-mixer.desktop.in.in rename to xfce4-mixer/xfce4-mixer.desktop.in _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits