[gnome-shell/nbtk-introduction] Makefile.am cleanups for NBTK
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-shell/nbtk-introduction] Makefile.am cleanups for NBTK
- Date: Tue, 22 Sep 2009 18:43:10 +0000 (UTC)
commit 9dbafe156e5663025148018f82894e702fe87943
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Sat Sep 19 20:39:13 2009 -0400
Makefile.am cleanups for NBTK
Clean up indentation, line up backslashes, and add missing $(AM_V_GEN).
Remove include of GTK+ when generating Nbtk-1.0.gir.
src/Makefile-nbtk.am | 8 ++++----
src/Makefile.am | 36 +++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 21 deletions(-)
---
diff --git a/src/Makefile-nbtk.am b/src/Makefile-nbtk.am
index d08e0b5..b690cf7 100644
--- a/src/Makefile-nbtk.am
+++ b/src/Makefile-nbtk.am
@@ -26,7 +26,7 @@ CLEANFILES += stamp-nbtk-marshal.h stamp-nbtk-enum-types.h
nbtk-marshal.h: stamp-nbtk-marshal.h
@true
stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list
- $(GLIB_GENMARSHAL) \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) \
--prefix=_nbtk_marshal \
--header \
$(srcdir)/nbtk/nbtk-marshal.list > $ tmp && \
@@ -35,7 +35,7 @@ stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list
echo timestamp > $(@F)
nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list
- (echo "#include \"nbtk-marshal.h\"" ; \
+ $(AM_V_GEN) (echo "#include \"nbtk-marshal.h\"" ; \
$(GLIB_GENMARSHAL) \
--prefix=_nbtk_marshal \
--body \
@@ -46,7 +46,7 @@ nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list
nbtk-enum-types.h: stamp-nbtk-enum-types.h Makefile
@true
stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in
- ( cd $(srcdir) && \
+ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template nbtk/nbtk-enum-types.h.in \
$(nbtk_source_h) ) >> $ tmp && \
@@ -55,7 +55,7 @@ stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in
echo timestamp > $(@F)
nbtk-enum-types.c: stamp-nbtk-enum-types.h nbtk/nbtk-enum-types.c.in
- ( cd $(srcdir) && \
+ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template nbtk/nbtk-enum-types.c.in \
$(nbtk_source_h) ) >> $ tmp && \
diff --git a/src/Makefile.am b/src/Makefile.am
index 760cb15..83837df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,7 +153,7 @@ libgnome_shell_la_LIBADD = \
$(MUTTER_PLUGIN_LIBS) \
$(LIBGNOMEUI_LIBS) \
libbig-1.0.la \
- libnbtk-1.0.la \
+ libnbtk-1.0.la \
libgdmuser-1.0.la \
libtray.la
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
@@ -209,23 +209,25 @@ Big-1.0.typelib: libbig-1.0.la Big-1.0.gir
$(AM_V_GEN) $(G_IR_COMPILER) Big-1.0.gir -o $@
CLEANFILES += Big-1.0.typelib
-Nbtk-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libnbtk-1.0.la Makefile
- $(AM_V_GEN) $(G_IR_SCANNER) \
- --namespace=Nbtk \
- --nsversion=1.0 \
- --include=Clutter-1.0 \
- --include=Gtk-2.0 \
- --libtool="$(LIBTOOL)" \
- --program=mutter \
- --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
- -DNBTK_COMPILATION \
- $(addprefix $(srcdir)/,$(nbtk_source_h)) \
- $(addprefix $(srcdir)/,$(nbtk_source_c)) \
- $(srcdir)/nbtk-enum-types.h \
- $(NBTK_CFLAGS) \
- -o $@
+Nbtk-1.0.gir: $(mutter) $(G_IR_SCANNER) Toolkit-0.1.gir libgnome-shell.la libnbtk-1.0.la Makefile
+ $(AM_V_GEN) $(G_IR_SCANNER) \
+ --namespace=Nbtk \
+ --nsversion=1.0 \
+ --include=Clutter-1.0 \
+ --add-include-path=$(builddir) \
+ --libtool="$(LIBTOOL)" \
+ --program=mutter \
+ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
+ -DNBTK_COMPILATION \
+ $(addprefix $(srcdir)/,$(nbtk_source_h)) \
+ $(addprefix $(srcdir)/,$(nbtk_source_c)) \
+ $(srcdir)/nbtk-enum-types.h \
+ $(NBTK_CFLAGS) \
+ -o $@
CLEANFILES += Nbtk-1.0.gir
Nbtk-1.0.typelib: Nbtk-1.0.gir
- $(AM_V_GEN) $(G_IR_COMPILER) Nbtk-1.0.gir -o $@
+ $(AM_V_GEN) $(G_IR_COMPILER) \
+ $< -o $@
+
CLEANFILES += Nbtk-1.0.typelib
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]