isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.am cleanups for NBTK

Browse Source 
Clean up indentation, line up backslashes, and add missing $(AM_V_GEN).
Remove include of GTK+ when generating Nbtk-1.0.gir.
This commit is contained in:
Owen W. Taylor 2009-09-19 20:39:13 -04:00
parent 277dd7106a
commit 9dbafe156e
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile-nbtk.am
View File

@ -26,7 +26,7 @@ CLEANFILES += stamp-nbtk-marshal.h stamp-nbtk-enum-types.h
nbtk-marshal.h: stamp-nbtk-marshal.h nbtk-marshal.h: stamp-nbtk-marshal.h
@true @true
stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list
$(GLIB_GENMARSHAL) \ $(AM_V_GEN) $(GLIB_GENMARSHAL) \
--prefix=_nbtk_marshal \ --prefix=_nbtk_marshal \
--header \ --header \
$(srcdir)/nbtk/nbtk-marshal.list > $@.tmp && \ $(srcdir)/nbtk/nbtk-marshal.list > $@.tmp && \
@ -35,7 +35,7 @@ stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list
echo timestamp > $(@F) echo timestamp > $(@F)
nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list
(echo "#include \"nbtk-marshal.h\"" ; \ $(AM_V_GEN) (echo "#include \"nbtk-marshal.h\"" ; \
$(GLIB_GENMARSHAL) \ $(GLIB_GENMARSHAL) \
--prefix=_nbtk_marshal \ --prefix=_nbtk_marshal \
--body \ --body \
@ -46,7 +46,7 @@ nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list
nbtk-enum-types.h: stamp-nbtk-enum-types.h Makefile nbtk-enum-types.h: stamp-nbtk-enum-types.h Makefile
@true @true
stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in
( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template nbtk/nbtk-enum-types.h.in \ --template nbtk/nbtk-enum-types.h.in \
$(nbtk_source_h) ) >> $@.tmp && \ $(nbtk_source_h) ) >> $@.tmp && \
@ -55,7 +55,7 @@ stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in
echo timestamp > $(@F) echo timestamp > $(@F)
nbtk-enum-types.c: stamp-nbtk-enum-types.h nbtk/nbtk-enum-types.c.in nbtk-enum-types.c: stamp-nbtk-enum-types.h nbtk/nbtk-enum-types.c.in
( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template nbtk/nbtk-enum-types.c.in \ --template nbtk/nbtk-enum-types.c.in \
$(nbtk_source_h) ) >> $@.tmp && \ $(nbtk_source_h) ) >> $@.tmp && \

36
src/Makefile.am
View File

@ -153,7 +153,7 @@ libgnome_shell_la_LIBADD = \
$(MUTTER_PLUGIN_LIBS) \ $(MUTTER_PLUGIN_LIBS) \
$(LIBGNOMEUI_LIBS) \ $(LIBGNOMEUI_LIBS) \
libbig-1.0.la \ libbig-1.0.la \
libnbtk-1.0.la \ libnbtk-1.0.la \
libgdmuser-1.0.la \ libgdmuser-1.0.la \
libtray.la libtray.la
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) 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 $@ $(AM_V_GEN) $(G_IR_COMPILER) Big-1.0.gir -o $@
CLEANFILES += Big-1.0.typelib CLEANFILES += Big-1.0.typelib
Nbtk-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libnbtk-1.0.la Makefile 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) \ $(AM_V_GEN) $(G_IR_SCANNER) \
--namespace=Nbtk \ --namespace=Nbtk \
--nsversion=1.0 \ --nsversion=1.0 \
--include=Clutter-1.0 \ --include=Clutter-1.0 \
--include=Gtk-2.0 \ --add-include-path=$(builddir) \
--libtool="$(LIBTOOL)" \ --libtool="$(LIBTOOL)" \
--program=mutter \ --program=mutter \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
-DNBTK_COMPILATION \ -DNBTK_COMPILATION \
$(addprefix $(srcdir)/,$(nbtk_source_h)) \ $(addprefix $(srcdir)/,$(nbtk_source_h)) \
$(addprefix $(srcdir)/,$(nbtk_source_c)) \ $(addprefix $(srcdir)/,$(nbtk_source_c)) \
$(srcdir)/nbtk-enum-types.h \ $(srcdir)/nbtk-enum-types.h \
$(NBTK_CFLAGS) \ $(NBTK_CFLAGS) \
-o $@ -o $@
CLEANFILES += Nbtk-1.0.gir CLEANFILES += Nbtk-1.0.gir
Nbtk-1.0.typelib: 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 CLEANFILES += Nbtk-1.0.typelib