diff --git a/configure.ac b/configure.ac index ef64a230f..32e2f14da 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,12 @@ -AC_INIT(gnome-shell, 0.0.1) +AC_INIT(gnome-shell, 0.1) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) + AC_CONFIG_HEADERS(config.h) AC_DISABLE_STATIC diff --git a/src/Makefile-big.am b/src/Makefile-big.am index c0ede9deb..fb4a48264 100644 --- a/src/Makefile-big.am +++ b/src/Makefile-big.am @@ -33,16 +33,16 @@ big_source_c = \ big-enum-types.h: stamp-big-enum-types.h Makefile @true stamp-big-enum-types.h: $(big_source_h) big/big-enum-types.h.in - ( cd $(srcdir) && \ + $(AM_V_GEN) ( cd $(srcdir) && \ $(GLIB_MKENUMS) \ --template $(srcdir)/big/big-enum-types.h.in \ $(big_source_h) ) >> xgen-teth && \ - (cmp xgen-teth big-enum-types.h || cp xgen-teth big-enum-types.h) && \ + (cmp -s xgen-teth big-enum-types.h || cp xgen-teth big-enum-types.h) && \ rm -f xgen-teth && \ echo timestamp > $(@F) big-enum-types.c: stamp-big-enum-types.h big/big-enum-types.c.in - ( cd $(srcdir) && \ + $(AM_V_GEN) ( cd $(srcdir) && \ $(GLIB_MKENUMS) \ --template $(srcdir)/big/big-enum-types.c.in \ $(big_source_h) ) >> xgen-tetc && \ diff --git a/src/Makefile-tidy.am b/src/Makefile-tidy.am index e76a11250..006980b72 100644 --- a/src/Makefile-tidy.am +++ b/src/Makefile-tidy.am @@ -33,7 +33,7 @@ tidy_source_c = \ tidy-marshal.h: stamp-tidy-marshal.h @true stamp-tidy-marshal.h: Makefile tidy/tidy-marshal.list - $(GLIB_GENMARSHAL) \ + $(AM_V_GEN) $(GLIB_GENMARSHAL) \ --prefix=_tidy_marshal \ --header \ $(srcdir)/tidy/tidy-marshal.list > xgen-tmh && \ @@ -42,7 +42,7 @@ stamp-tidy-marshal.h: Makefile tidy/tidy-marshal.list echo timestamp > $(@F) tidy-marshal.c: Makefile tidy/tidy-marshal.list - (echo "#include \"tidy-marshal.h\"" ; \ + $(AM_V_GEN) (echo "#include \"tidy-marshal.h\"" ; \ $(GLIB_GENMARSHAL) \ --prefix=_tidy_marshal \ --body \ @@ -53,16 +53,16 @@ tidy-marshal.c: Makefile tidy/tidy-marshal.list tidy-enum-types.h: stamp-tidy-enum-types.h Makefile @true stamp-tidy-enum-types.h: $(tidy_source_h) tidy/tidy-enum-types.h.in - ( cd $(srcdir) && \ + $(AM_V_GEN) ( cd $(srcdir) && \ $(GLIB_MKENUMS) \ --template $(srcdir)/tidy/tidy-enum-types.h.in \ $(tidy_source_h) ) >> xgen-teth && \ - (cmp xgen-teth tidy-enum-types.h || cp xgen-teth tidy-enum-types.h) && \ + (cmp -s xgen-teth tidy-enum-types.h || cp xgen-teth tidy-enum-types.h) && \ rm -f xgen-teth && \ echo timestamp > $(@F) tidy-enum-types.c: stamp-tidy-enum-types.h tidy/tidy-enum-types.c.in - ( cd $(srcdir) && \ + $(AM_V_GEN) ( cd $(srcdir) && \ $(GLIB_MKENUMS) \ --template $(srcdir)/tidy/tidy-enum-types.c.in \ $(tidy_source_h) ) >> xgen-tetc && \ diff --git a/src/Makefile-tray.am b/src/Makefile-tray.am index 91be199f5..86e41cc92 100644 --- a/src/Makefile-tray.am +++ b/src/Makefile-tray.am @@ -24,7 +24,7 @@ tray_source = \ na-marshal.h: stamp-na-marshal.h @true stamp-na-marshal.h: Makefile tray/na-marshal.list - $(GLIB_GENMARSHAL) \ + $(AM_V_GEN) $(GLIB_GENMARSHAL) \ --prefix=_na_marshal \ --header \ $(srcdir)/tray/na-marshal.list > xgen-tmh && \ @@ -33,7 +33,7 @@ stamp-na-marshal.h: Makefile tray/na-marshal.list echo timestamp > $(@F) na-marshal.c: Makefile tray/na-marshal.list - (echo "#include \"na-marshal.h\"" ; \ + $(AM_V_GEN) (echo "#include \"na-marshal.h\"" ; \ $(GLIB_GENMARSHAL) \ --prefix=_na_marshal \ --body \ diff --git a/src/Makefile.am b/src/Makefile.am index 1959d09db..d1bf9831b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = bin_SCRIPTS = gnome-shell gnome-shell: gnome-shell.in - sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \ + $(AM_V_GEN) sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \ -e "s|@GJS_JS_DIR[@]|$(GJS_JS_DIR)|" \ -e "s|@GJS_JS_NATIVE_DIR[@]|$(GJS_JS_NATIVE_DIR)|" \ -e "s|@libexecdir[@]|$(libexecdir)|" \ @@ -121,7 +121,7 @@ libgnome_shell_la_gir_sources = \ shell-marshal.h: stamp-shell-marshal.h @true stamp-shell-marshal.h: Makefile shell-marshal.list - $(GLIB_GENMARSHAL) \ + $(AM_V_GEN) $(GLIB_GENMARSHAL) \ --prefix=_shell_marshal \ --header \ $(srcdir)/shell-marshal.list > xgen-tmh && \ @@ -130,7 +130,7 @@ stamp-shell-marshal.h: Makefile shell-marshal.list echo timestamp > $(@F) shell-marshal.c: Makefile shell-marshal.list - (echo "#include \"shell-marshal.h\"" ; \ + $(AM_V_GEN) (echo "#include \"shell-marshal.h\"" ; \ $(GLIB_GENMARSHAL) \ --prefix=_shell_marshal \ --body \ @@ -152,7 +152,7 @@ typelibdir = $(pkglibdir) typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib Big-1.0.typelib Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile - $(G_IR_SCANNER) \ + $(AM_V_GEN) $(G_IR_SCANNER) \ --namespace=Shell \ --nsversion=0.1 \ --add-include-path=$(MUTTER_LIB_DIR)/mutter/ \ @@ -174,7 +174,7 @@ Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir CLEANFILES += Shell-0.1.typelib Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile - $(G_IR_SCANNER) \ + $(AM_V_GEN) $(G_IR_SCANNER) \ --namespace=Tidy \ --nsversion=1.0 \ --include=Clutter-1.0 \ @@ -192,8 +192,8 @@ Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir CLEANFILES += Tidy-1.0.typelib Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile - $(G_IR_SCANNER) \ - --namespace=Big \ + $(AM_V_GEN) $(G_IR_SCANNER) \ + --namespace=Big \ --nsversion=1.0 \ --include=Clutter-1.0 \ --include=GdkPixbuf-2.0 \