[mutter] build: Only install libmutter-private for GTK3 builds
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] build: Only install libmutter-private for GTK3 builds
- Date: Sun, 26 Sep 2010 15:25:30 +0000 (UTC)
commit dc80242e51a683f114854b54e69e1ebb189b221a
Author: Benjamin Otte <otte redhat com>
Date: Thu Sep 23 14:32:48 2010 +0200
build: Only install libmutter-private for GTK3 builds
Define INSTALL_LIBMUTTER_PRIVATE with AM_CONDITIONAL and use it to build
an installed or uninstalled libmutter-private.so
https://bugzilla.gnome.org/show_bug.cgi?id=630203
configure.in | 2 ++
src/Makefile.am | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index c0f1873..e2ce16a 100644
--- a/configure.in
+++ b/configure.in
@@ -150,6 +150,8 @@ case "$with_gtk" in
;;
esac
+AM_CONDITIONAL(INSTALL_LIBMUTTER_PRIVATE, test "$with_gtk" = "3.0")
+
MUTTER_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0"
AC_SUBST(GTK_API_VERSION)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3da19db..168bd72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,11 @@
# Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
.AUTOPARALLEL:
+if INSTALL_LIBMUTTER_PRIVATE
lib_LTLIBRARIES = libmutter-private.la
+else
+noinst_LTLIBRARIES = libmutter-private.la
+endif
SUBDIRS=wm-tester tools compositor/plugins
@@ -150,8 +154,6 @@ libmutter_private_la_SOURCES= \
libmutter_private_la_LDFLAGS = -no-undefined
libmutter_private_la_LIBADD = @MUTTER_LIBS@
-libmutterincludedir = $(includedir)/mutter/mutter-private
-
# Headers installed for plugins; introspected information will
# be extracted into Mutter-<version>.gir
libmutterinclude_base_headers = \
@@ -184,9 +186,17 @@ libmutterinclude_extra_headers = \
include/atomnames.h \
include/region.h
+if INSTALL_LIBMUTTER_PRIVATE
+libmutterincludedir = $(includedir)/mutter/mutter-private
+
libmutterinclude_HEADERS = \
$(libmutterinclude_base_headers) \
$(libmutterinclude_extra_headers)
+else
+noinst_HEADERS = \
+ $(libmutterinclude_base_headers) \
+ $(libmutterinclude_extra_headers)
+endif
mutter_theme_viewer_SOURCES= \
ui/theme-viewer.c
@@ -296,9 +306,11 @@ CLEANFILES = \
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+if INSTALL_LIBMUTTER_PRIVATE
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmutter-private.pc mutter-plugins.pc
+endif
EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_files) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]