mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 12:32:05 +00:00
Changes necessary to build plugins out of tree:
metacity-plugins.pc.in installation necessary header files fixed misplaced inclusion of config.h
This commit is contained in:
parent
2a3445c865
commit
68c2f75558
@ -299,8 +299,9 @@ if test x$have_xrender = xyes; then
|
|||||||
AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
|
AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CLUTTER_PACKAGE=clutter-0.8
|
||||||
|
AC_SUBST(CLUTTER_PACKAGE)
|
||||||
if test x$have_clutter = xyes; then
|
if test x$have_clutter = xyes; then
|
||||||
CLUTTER_PACKAGE=clutter-0.8
|
|
||||||
METACITY_PC_MODULES="$METACITY_PC_MODULES $CLUTTER_PACKAGE "
|
METACITY_PC_MODULES="$METACITY_PC_MODULES $CLUTTER_PACKAGE "
|
||||||
PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
|
PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
|
||||||
AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
|
AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
|
||||||
@ -533,6 +534,7 @@ doc/man/Makefile
|
|||||||
src/Makefile
|
src/Makefile
|
||||||
src/wm-tester/Makefile
|
src/wm-tester/Makefile
|
||||||
src/libmetacity-private.pc
|
src/libmetacity-private.pc
|
||||||
|
src/metacity-plugins.pc
|
||||||
src/tools/Makefile
|
src/tools/Makefile
|
||||||
src/themes/Makefile
|
src/themes/Makefile
|
||||||
src/compositor/mutter/plugins/Makefile
|
src/compositor/mutter/plugins/Makefile
|
||||||
|
@ -147,7 +147,16 @@ libmetacityinclude_HEADERS = \
|
|||||||
include/common.h \
|
include/common.h \
|
||||||
ui/preview-widget.h \
|
ui/preview-widget.h \
|
||||||
ui/theme-parser.h \
|
ui/theme-parser.h \
|
||||||
ui/theme.h
|
ui/theme.h \
|
||||||
|
include/prefs.h \
|
||||||
|
include/window.h \
|
||||||
|
include/workspace.h \
|
||||||
|
include/compositor.h \
|
||||||
|
include/compositor-mutter.h \
|
||||||
|
include/types.h \
|
||||||
|
include/screen.h \
|
||||||
|
include/display.h \
|
||||||
|
include/mutter-plugin.h
|
||||||
|
|
||||||
metacity_theme_viewer_SOURCES= \
|
metacity_theme_viewer_SOURCES= \
|
||||||
ui/theme-viewer.c
|
ui/theme-viewer.c
|
||||||
@ -218,14 +227,15 @@ inlinepixbufs.h: $(IMAGES)
|
|||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
|
||||||
pkgconfig_DATA = libmetacity-private.pc
|
pkgconfig_DATA = libmetacity-private.pc metacity-plugins.pc
|
||||||
|
|
||||||
EXTRA_DIST=$(desktopfiles_files) \
|
EXTRA_DIST=$(desktopfiles_files) \
|
||||||
$(wmproperties_files) \
|
$(wmproperties_files) \
|
||||||
$(IMAGES) $(schema_DATA) \
|
$(IMAGES) $(schema_DATA) \
|
||||||
$(desktopfiles_in_files) \
|
$(desktopfiles_in_files) \
|
||||||
$(wmproperties_in_files) \
|
$(wmproperties_in_files) \
|
||||||
$(schema_in_files) \
|
$(schema_in_files) \
|
||||||
$(xml_in_files) \
|
$(xml_in_files) \
|
||||||
libmetacity-private.pc.in
|
libmetacity-private.pc.in \
|
||||||
|
metacity-plugins.pc.in
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
* 02111-1307, USA.
|
* 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
#include "mutter-plugin-manager.h"
|
#include "mutter-plugin-manager.h"
|
||||||
#include "prefs.h"
|
#include "prefs.h"
|
||||||
#include "errors.h"
|
#include "errors.h"
|
||||||
|
@ -5,8 +5,6 @@ if WITH_CLUTTER
|
|||||||
|
|
||||||
INCLUDES=@METACITY_CFLAGS@ -I $(top_srcdir)/src/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
|
INCLUDES=@METACITY_CFLAGS@ -I $(top_srcdir)/src/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = default.la
|
|
||||||
|
|
||||||
default_la_CFLAGS = -fPIC
|
default_la_CFLAGS = -fPIC
|
||||||
default_la_SOURCES = default.c
|
default_la_SOURCES = default.c
|
||||||
default_la_LDFLAGS = -module -avoid-version -no-undefined
|
default_la_LDFLAGS = -module -avoid-version -no-undefined
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#define MUTTER_PLUGIN_H_
|
#define MUTTER_PLUGIN_H_
|
||||||
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
#include "config.h"
|
|
||||||
#include "compositor.h"
|
#include "compositor.h"
|
||||||
#include "compositor-mutter.h"
|
#include "compositor-mutter.h"
|
||||||
|
|
||||||
|
17
src/metacity-plugins.pc.in
Normal file
17
src/metacity-plugins.pc.in
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
pkglibdir=@pkglibdir@
|
||||||
|
libgnome_serverdir=@libexecdir@
|
||||||
|
metacity_major_version=@METACITY_MAJOR_VERSION@
|
||||||
|
metacity_minor_version=@METACITY_MINOR_VERSION@
|
||||||
|
metacity_micro_version=@METACITY_MICRO_VERSION@
|
||||||
|
metacity_clutter_plugin_api_version=@METACITY_CLUTTER_PLUGIN_API_VERSION@
|
||||||
|
|
||||||
|
Name: metacity-plugins
|
||||||
|
Description: Dev parameters for mutter plugins
|
||||||
|
Requires: @CLUTTER_PACKAGE@
|
||||||
|
Version: @VERSION@
|
||||||
|
Libs: @CLUTTER_LIBS@
|
||||||
|
Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMETACITY_PKGLIBDIR=\"${pkglibdir}\"
|
Loading…
Reference in New Issue
Block a user