Use metacity for building Tidy-1.0.gir as well; fix up dependencies

svn path=/trunk/; revision=51
This commit is contained in:
Colin Walters 2008-11-14 22:47:33 +00:00
parent 6596010802
commit ab0f4df2b4

View File

@ -32,9 +32,7 @@ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
typelibdir = $(pkglibdir)/girepository typelibdir = $(pkglibdir)/girepository
typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib
# After we run g-ir-scanner, we need to change the library name written in Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la Makefile
# the .gir file from the "fake" second copy of the library to the real name
Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) $(libgnome_shell_la_SOURCES) Makefile
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Shell \ --namespace=Shell \
--nsversion=0.1 \ --nsversion=0.1 \
@ -53,15 +51,13 @@ Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@ LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@
CLEANFILES += Shell-1.0.typelib CLEANFILES += Shell-1.0.typelib
# After we run g-ir-scanner, we need to change the library name written in Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile
# the .gir file from the "fake" second copy of the library to the real name
Tidy-1.0.gir: $(tidy_source_h) $(tidy_source_c) Makefile
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Tidy \ --namespace=Tidy \
--nsversion=1.0 \ --nsversion=1.0 \
--include=Clutter-0.8 \ --include=Clutter-0.8 \
--library=tidy-1.0 \ --program=metacity \
--pkg=clutter-0.8 \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
$(tidy_source_h) \ $(tidy_source_h) \
$(tidy_source_c) \ $(tidy_source_c) \
$(tidy_cflags) \ $(tidy_cflags) \