File mutter-build-fix.patch of Package mutter

Overview Repositories Revisions Requests Users Attributes Meta

File mutter-build-fix.patch of Package mutter (Revision d43a9ea9e25920a672dc2afcfd7c9ef8)

Currently displaying revision d43a9ea9e25920a672dc2afcfd7c9ef8 , Show latest

commit ec2c197e1fa12698850b655da054e5528ce8a727
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date:   Fri Jul 17 07:51:21 2009 -0400

Fix confusion about MetaPreview in introspection build
    
    MetaPreview is only built into libmutter-private, and not included in
    the mutter executable. Linking mutter against libmutter-private was
    inadvertently added when the introspection build process was set up,
    but isn't actually needed, and if -Wl,-as-needed is added during the
    build process, then the libmutter-private dependency will be skipped.
    
    * Don't link mutter (or the test programs) against libmutter-private
    
    * Exclude meta-preview.h from the set of headers we feed into the
      introspection build process
    
    Reported by Patryk Zawadzki
    
    http://bugzilla.gnome.org/show_bug.cgi?id=587975

diff --git a/src/Makefile.am b/src/Makefile.am
index c51a339..b675ab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -147,6 +147,8 @@ 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 =		\
 	include/alttabhandler.h			\
 	include/boxes.h				\
@@ -154,7 +156,6 @@ libmutterinclude_base_headers =		\
 	include/main.h				\
 	include/util.h				\
 	include/common.h			\
-	ui/preview-widget.h			\
 	ui/theme-parser.h			\
 	ui/theme.h				\
 	include/prefs.h				\
@@ -171,7 +172,10 @@ libmutterinclude_base_headers =		\
 	include/mutter-window.h
 
 # Excluded from scanning for introspection but installed
+# preview-widget.h: only part of libmutter-private
+# atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
+	ui/preview-widget.h			\
 	include/atomnames.h
 
 libmutterinclude_HEADERS =			\
@@ -221,7 +225,7 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
 endif
 
 EFENCE=
-mutter_LDADD=@MUTTER_LIBS@ libmutter-private.la $(EFENCE)
+mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
 mutter_LDFLAGS=-export-dynamic
 
 mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
@@ -232,9 +236,9 @@ testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyn
 
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
-testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la
+testboxes_LDADD= @MUTTER_LIBS@
+testgradient_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD= @MUTTER_LIBS@
 
 @INTLTOOL_DESKTOP_RULE@

Places

File mutter-build-fix.patch of Package mutter (Revision d43a9ea9e25920a672dc2afcfd7c9ef8)

Places