From 3ba8532bdce18fd89e954f0438476c668bf1df5d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 9 Apr 2014 15:12:50 -0700 Subject: [PATCH] Revert "wayland: make parallel installable with regular mutter" This reverts commit ea3d2b4759524345c89fe08ad0c159d7136dbdf1. --- .gitignore | 6 ++--- configure.ac | 10 +++------ data/Makefile.am | 3 +++ doc/reference/Makefile.am | 2 +- mutter.doap | 1 - src/Makefile.am | 42 +++++++++++++++++------------------ src/libmutter-wayland.pc.in | 18 --------------- src/libmutter.pc.in | 18 +++++++++++++++ src/mutter-wayland.desktop.in | 3 ++- src/mutter.desktop.in | 17 ++++++++++++++ 10 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 data/Makefile.am delete mode 100644 src/libmutter-wayland.pc.in create mode 100644 src/libmutter.pc.in create mode 100644 src/mutter.desktop.in diff --git a/.gitignore b/.gitignore index 0bf82c3c9..214b3824b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ missing src/50-mutter-navigation.xml src/50-mutter-system.xml src/50-mutter-windows.xml -src/mutter-wm.desktop +src/mutter.desktop src/mutter-wayland.desktop *.o *.a @@ -46,8 +46,8 @@ POTFILES po/*.pot 50-metacity-desktop-key.xml 50-metacity-key.xml -libmutter-wayland.pc -mutter-wayland +libmutter.pc +mutter mutter-launch org.gnome.mutter.gschema.valid org.gnome.mutter.gschema.xml diff --git a/configure.ac b/configure.ac index ea9e674a7..65a431f72 100644 --- a/configure.ac +++ b/configure.ac @@ -21,10 +21,6 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) AM_MAINTAINER_MODE([enable]) -# Change pkglibdir and pkgdatadir to mutter-wayland instead of mutter -PACKAGE="mutter-wayland" -AC_SUBST([PACKAGE], [$PACKAGE]) - MUTTER_MAJOR_VERSION=mutter_major_version MUTTER_MINOR_VERSION=mutter_minor_version MUTTER_MICRO_VERSION=mutter_micro_version @@ -40,7 +36,7 @@ AC_SUBST(MUTTER_PLUGIN_DIR) # Honor aclocal flags AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") -GETTEXT_PACKAGE=mutter-wayland +GETTEXT_PACKAGE=mutter AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain]) @@ -452,7 +448,7 @@ doc/man/Makefile doc/reference/Makefile doc/reference/meta-docs.sgml src/Makefile -src/libmutter-wayland.pc +src/libmutter.pc src/compositor/plugins/Makefile po/Makefile.in ]) @@ -469,7 +465,7 @@ fi dnl ========================================================================== echo " -mutter-wayland-$VERSION +mutter-$VERSION prefix: ${prefix} source code location: ${srcdir} diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 000000000..3ad550e5a --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,3 @@ +defaultcursordir = $(datadir)/mutter/cursors + +dist_defaultcursor_DATA = left_ptr.png diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index e0e702e58..f411e2629 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -140,7 +140,7 @@ expand_content_files= \ # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=$(MUTTER_CFLAGS) -GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter-wayland.la +GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/mutter.doap b/mutter.doap index 370db44c2..66132ec9f 100644 --- a/mutter.doap +++ b/mutter.doap @@ -21,7 +21,6 @@ environment. --> - diff --git a/src/Makefile.am b/src/Makefile.am index 61cbb7ab0..7a88718c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905 .AUTOPARALLEL: -lib_LTLIBRARIES = libmutter-wayland.la +lib_LTLIBRARIES = libmutter.la SUBDIRS=compositor/plugins @@ -11,7 +11,6 @@ INCLUDES= \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_ENABLE_EXPERIMENTAL_2_0_API \ $(MUTTER_CFLAGS) \ - -I$(top_builddir) \ -I$(srcdir) \ -I$(srcdir)/backends \ -I$(srcdir)/core \ @@ -47,7 +46,7 @@ wayland_protocols = \ wayland/protocol/gtk-shell.xml \ wayland/protocol/xdg-shell.xml -libmutter_wayland_la_SOURCES = \ +libmutter_la_SOURCES = \ backends/meta-backend.c \ backends/meta-backend.h \ backends/meta-cursor.c \ @@ -232,11 +231,11 @@ libmutter_wayland_la_SOURCES = \ wayland/window-wayland.c \ wayland/window-wayland.h -nodist_libmutter_wayland_la_SOURCES = \ +nodist_libmutter_la_SOURCES = \ $(mutter_built_sources) -libmutter_wayland_la_LDFLAGS = -no-undefined -libmutter_wayland_la_LIBADD = $(MUTTER_LIBS) +libmutter_la_LDFLAGS = -no-undefined +libmutter_la_LIBADD = $(MUTTER_LIBS) # Headers installed for plugins; introspected information will # be extracted into Mutter-.gir @@ -274,16 +273,16 @@ libmutterinclude_base_headers = \ libmutterinclude_extra_headers = \ meta/atomnames.h -libmutterincludedir = $(includedir)/mutter-wayland/meta +libmutterincludedir = $(includedir)/mutter/meta libmutterinclude_HEADERS = \ $(libmutterinclude_base_headers) \ $(libmutterinclude_extra_headers) -bin_PROGRAMS=mutter-wayland +bin_PROGRAMS=mutter -mutter_wayland_SOURCES = core/mutter.c -mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la +mutter_SOURCES = core/mutter.c +mutter_LDADD = $(MUTTER_LIBS) libmutter.la bin_PROGRAMS+=mutter-launch @@ -318,15 +317,15 @@ typelib_DATA = Meta-$(api_version).typelib INTROSPECTION_GIRS = Meta-$(api_version).gir -Meta-$(api_version).gir: libmutter-wayland.la +Meta-$(api_version).gir: libmutter.la @META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0 -@META_GIR@_EXPORT_PACKAGES = libmutter-wayland +@META_GIR@_EXPORT_PACKAGES = libmutter @META_GIR@_CFLAGS = $(INCLUDES) -@META_GIR@_LIBS = libmutter-wayland.la +@META_GIR@_LIBS = libmutter.la @META_GIR@_FILES = \ mutter-enum-types.h \ $(libmutterinclude_base_headers) \ - $(filter %.c,$(libmutter_wayland_la_SOURCES) $(nodist_libmutter_wayland_la_SOURCES)) + $(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES)) @META_GIR@_SCANNERFLAGS = --warn-all --warn-error endif @@ -337,14 +336,14 @@ testasyncgetprop_SOURCES = x11/testasyncgetprop.c noinst_PROGRAMS=testboxes testgradient testasyncgetprop -testboxes_LDADD = $(MUTTER_LIBS) libmutter-wayland.la -testgradient_LDADD = $(MUTTER_LIBS) libmutter-wayland.la -testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wayland.la +testboxes_LDADD = $(MUTTER_LIBS) libmutter.la +testgradient_LDADD = $(MUTTER_LIBS) libmutter.la +testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la @INTLTOOL_DESKTOP_RULE@ desktopfilesdir=$(datadir)/applications -desktopfiles_in_files=mutter-wayland.desktop.in +desktopfiles_in_files=mutter.desktop.in desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) desktopfiles_DATA = $(desktopfiles_files) @@ -365,7 +364,7 @@ convertdir = $(datadir)/GConf/gsettings convert_DATA = mutter-schemas.convert CLEANFILES = \ - mutter-wayland.desktop \ + mutter.desktop \ mutter-wm.desktop \ org.gnome.mutter.gschema.xml \ org.gnome.mutter.wayland.gschema.xml \ @@ -376,7 +375,7 @@ CLEANFILES = \ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmutter-wayland.pc +pkgconfig_DATA = libmutter.pc EXTRA_DIST=$(desktopfiles_files) \ $(wmproperties_files) \ @@ -388,7 +387,8 @@ EXTRA_DIST=$(desktopfiles_files) \ org.gnome.mutter.gschema.xml.in \ org.gnome.mutter.wayland.gschema.xml.in \ mutter-schemas.convert \ - libmutter-wayland.pc.in \ + libmutter.pc.in \ + mutter-plugins.pc.in \ mutter-enum-types.h.in \ mutter-enum-types.c.in \ org.gnome.Mutter.DisplayConfig.xml \ diff --git a/src/libmutter-wayland.pc.in b/src/libmutter-wayland.pc.in deleted file mode 100644 index 6537c4f75..000000000 --- a/src/libmutter-wayland.pc.in +++ /dev/null @@ -1,18 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -girdir=@libdir@/mutter-wayland -typelibdir=@libdir@/mutter-wayland - -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: libmutter-wayland -Description: Mutter window manager library (Wayland branch) -Requires: gsettings-desktop-schemas gtk+-3.0 @CLUTTER_PACKAGE@ x11 wayland-server -Version: @VERSION@ -Libs: -L${libdir} -lmutter-wayland -Cflags: -I${includedir}/mutter-wayland -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} diff --git a/src/libmutter.pc.in b/src/libmutter.pc.in new file mode 100644 index 000000000..1f819af80 --- /dev/null +++ b/src/libmutter.pc.in @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +girdir=@libdir@/mutter +typelibdir=@libdir@/mutter + +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: libmutter +Description: Mutter window manager library +Requires: gsettings-desktop-schemas gtk+-3.0 @CLUTTER_PACKAGE@ x11 +Version: @VERSION@ +Libs: -L${libdir} -lmutter +Cflags: -I${includedir}/mutter -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} diff --git a/src/mutter-wayland.desktop.in b/src/mutter-wayland.desktop.in index 9f213166a..fb51a1734 100644 --- a/src/mutter-wayland.desktop.in +++ b/src/mutter-wayland.desktop.in @@ -12,5 +12,6 @@ X-GnomeWMSettingsLibrary=metacity X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=mutter X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-Phase=DisplayServer +X-GNOME-Autostart-Phase=WindowManager +X-GNOME-Provides=windowmanager X-GNOME-Autostart-Notify=true diff --git a/src/mutter.desktop.in b/src/mutter.desktop.in new file mode 100644 index 000000000..3bfb88d2d --- /dev/null +++ b/src/mutter.desktop.in @@ -0,0 +1,17 @@ +[Desktop Entry] +Type=Application +_Name=Mutter +Exec=mutter +NoDisplay=true +# 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