brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix confusion about MetaPreview in introspection build

Browse Source 
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
This commit is contained in:
Owen W. Taylor 2009-07-17 07:51:21 -04:00
parent 0060c8ddb9
commit ec2c197e1f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.am
View File

@ -147,6 +147,8 @@ libmutter_private_la_LIBADD = @MUTTER_LIBS@
libmutterincludedir = $(includedir)/mutter/mutter-private libmutterincludedir = $(includedir)/mutter/mutter-private
# Headers installed for plugins; introspected information will
# be extracted into Mutter-<version>.gir
libmutterinclude_base_headers = \ libmutterinclude_base_headers = \
include/alttabhandler.h \ include/alttabhandler.h \
include/boxes.h \ include/boxes.h \
@ -154,7 +156,6 @@ libmutterinclude_base_headers = \
include/main.h \ include/main.h \
include/util.h \ include/util.h \
include/common.h \ include/common.h \
ui/preview-widget.h \
ui/theme-parser.h \ ui/theme-parser.h \
ui/theme.h \ ui/theme.h \
include/prefs.h \ include/prefs.h \
@ -171,7 +172,10 @@ libmutterinclude_base_headers = \
include/mutter-window.h include/mutter-window.h
# Excluded from scanning for introspection but installed # 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 = \ libmutterinclude_extra_headers = \
ui/preview-widget.h \
include/atomnames.h include/atomnames.h
libmutterinclude_HEADERS = \ libmutterinclude_HEADERS = \
@ -221,7 +225,7 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
endif endif
EFENCE= EFENCE=
mutter_LDADD=@MUTTER_LIBS@ libmutter-private.la $(EFENCE) mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
mutter_LDFLAGS=-export-dynamic mutter_LDFLAGS=-export-dynamic
mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la 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 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la testboxes_LDADD= @MUTTER_LIBS@
testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la testgradient_LDADD= @MUTTER_LIBS@
testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la testasyncgetprop_LDADD= @MUTTER_LIBS@
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@