From 542a0886cf14cec3995ada289e25f16aac772fd3 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 16 Aug 2013 14:07:46 +0200 Subject: [PATCH] Remove files no one cares about anymore mutter-plugins.pc has been replaced by libmutter.pc, and the wm properties in the control center are long gone. https://bugzilla.gnome.org/show_bug.cgi?id=705497 --- configure.ac | 1 - src/Makefile.am | 7 +------ src/mutter-plugins.pc.in | 17 ----------------- src/mutter-wm.desktop.in | 20 -------------------- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 src/mutter-plugins.pc.in delete mode 100644 src/mutter-wm.desktop.in diff --git a/configure.ac b/configure.ac index dfaf23f02..92febfb4e 100644 --- a/configure.ac +++ b/configure.ac @@ -459,7 +459,6 @@ doc/reference/Makefile doc/reference/meta-docs.sgml src/Makefile src/libmutter.pc -src/mutter-plugins.pc src/compositor/plugins/Makefile protocol/Makefile data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 7d9af02dd..133c411bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -288,11 +288,6 @@ desktopfiles_in_files=mutter.desktop.in desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) desktopfiles_DATA = $(desktopfiles_files) -wmpropertiesdir=$(datadir)/gnome/wm-properties -wmproperties_in_files=mutter-wm.desktop.in -wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop) -wmproperties_DATA = $(wmproperties_files) - xmldir = @GNOME_KEYBINDINGS_KEYSDIR@ xml_in_files = \ 50-mutter-navigation.xml.in \ @@ -320,7 +315,7 @@ CLEANFILES = \ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmutter.pc mutter-plugins.pc +pkgconfig_DATA = libmutter.pc EXTRA_DIST=$(desktopfiles_files) \ $(wmproperties_files) \ diff --git a/src/mutter-plugins.pc.in b/src/mutter-plugins.pc.in deleted file mode 100644 index 5d42232ee..000000000 --- a/src/mutter-plugins.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -plugindir=@MUTTER_PLUGIN_DIR@ -libgnome_serverdir=@libexecdir@ -mutter_major_version=@MUTTER_MAJOR_VERSION@ -mutter_minor_version=@MUTTER_MINOR_VERSION@ -mutter_micro_version=@MUTTER_MICRO_VERSION@ -mutter_plugin_api_version=@MUTTER_PLUGIN_API_VERSION@ - -Name: mutter-plugins -Description: Dev parameters for mutter plugins -Requires: @CLUTTER_PACKAGE@ -Version: @VERSION@ -Libs: @CLUTTER_LIBS@ -Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\" diff --git a/src/mutter-wm.desktop.in b/src/mutter-wm.desktop.in deleted file mode 100644 index 2b60c7e0f..000000000 --- a/src/mutter-wm.desktop.in +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Type=Application -_Name=Mutter -Exec=mutter -# name of loadable control center module -X-GNOME-WMSettingsModule=metacity -# name we put on the WM spec check window -X-GNOME-WMName=Mutter -# back compat only -X-GnomeWMSettingsLibrary=metacity -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=mutter -X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-Phase=WindowManager -X-GNOME-Provides=windowmanager -X-GNOME-Autostart-Notify=true - -[Window Manager] -SessionManaged=true -