Changeset 2744

Timestamp:

Jun 8, 2012, 3:50:16 AM (9 years ago)

Author:

Peter

Message:

conform rules make rules for yat-hello.1.0.tar.gz, yat-config and
yat.pc with style used in silent mode.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• build_support/Makefile.am (modified) (2 diffs)
• doc/Makefile.am (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)

trunk/Makefile.am

@@ -34 +34 @@
 
 FORCE:
+
+## variable to used to switch between verbose output and silence
+## yat_dev_null expands to empty string in verbose mode and to >
+## /dev/null in silent mode, so 'echo hello $(yat_dev_null)' will
+## display hello in verbose mode and being silent in silent mode.
+yat_dev_null = $(yat_dev_null_$(V))
+yat_dev_null_ = $(yat_dev_null_$(AM_DEFAULT_VERBOSITY))
+yat_dev_null_0 = > /dev/null
 
 include build_support/Makefile.am

trunk/build_support/Makefile.am

@@ -64 +64 @@
 
 build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in
-  @rm -f $@ $@.tmp
-  @echo "#! $(SHELL)" > $@.tmp
-  @echo "# $@ generated by make from yat-config.in" >> $@.tmp
-  @$(edit) '$(srcdir)/$@.in' >>$@.tmp
-  @chmod +x $@.tmp
-  @chmod a-w $@.tmp
-  @mv $@.tmp $@
-  @echo creating $@
+  @$(AM_V_GEN)rm -f $@ $@.tmp \
+  && echo "#! $(SHELL)" > $@.tmp \
+  && echo "# $@ generated by make from yat-config.in" >> $@.tmp \
+  && $(edit) '$(srcdir)/$@.in' >>$@.tmp \
+  && chmod +x $@.tmp \
+  && chmod a-w $@.tmp \
+  && mv $@.tmp $@
 
 build_support/for_installation/yat-config: build_support/yat-config
-  @rm -f $@ $@-t \
+  $(AM_V_GEN)rm -f $@ $@-t \
   && $(MKDIR_P) build_support/for_installation \
   && sed 's|installed=no|installed=yes|g' < build_support/yat-config > $@-t \
-  && mv $@-t $@ && echo creating $@
+  && mv $@-t $@
 
 build_support/yat.pc: $(srcdir)/build_support/yat.pc.in build_support/gen_yat_pc.sh Makefile
-  rm -f $@ $@-t \
+  $(AM_V_GEN)rm -f $@ $@-t \
   && cd build_support \
   && $(SHELL) gen_yat_pc.sh --prefix="$(prefix)" \
@@ -86 +85 @@
   --libdir="$(libdir)" --includedir="$(includedir)" \
   --input="../$(srcdir)/build_support/yat.pc.in" > yat.pc-t \
-  && mv yat.pc-t yat.pc && echo creating $@
+  && mv yat.pc-t yat.pc

trunk/doc/Makefile.am

@@ -25 +25 @@
 
 DOXYGEN_FILES = $(srcdir)/doc/build_tool.doxygen \
-$(builddir)/doc/first_page.doxygen \
 $(srcdir)/doc/deprecated.doxygen \
 $(srcdir)/doc/footer.html \
@@ -37 +36 @@
 DOXYGEN_INPUT += $(nobase_include_HEADERS)
 DOXYGEN_INPUT += $(nobase_nodist_include_HEADERS)
+DOXYGEN_INPUT += $(builddir)/doc/first_page.doxygen
 
 DOXYGEN_DEPS = $(DOXYGEN_INPUT) doc/doxygen.config
@@ -45 +45 @@
 endif
 
-dx_dev_null = $(dx_dev_null_$(V))
-dx_dev_null_ = $(dx_dev_null_$(AM_DEFAULT_VERBOSITY))
-dx_dev_null_0 = > /dev/null
-
 doc/$(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
   $(AM_V_GEN)
   $(AM_V_at){ cat doc/doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
-  echo GENERATE_HTML = YES; } | $(DOXYGEN) - $(dx_dev_null);
+  echo GENERATE_HTML = YES; } | $(DOXYGEN) - $(yat_dev_null);
 
 install-data-hook: install-html

trunk/test/Makefile.am

@@ -185 +185 @@
 
 $(srcdir)/test/yat-hello-1.0.tar.gz: $(yat_hello_deps)
-  cd $(srcdir)/test/yat-hello \
+  $(AM_V_GEN)cd $(srcdir)/test/yat-hello \
   && $(MKDIR_P) m4 \
   && cp $(abs_top_srcdir)/m4/yat.m4 m4/ \
-  && autoreconf -ivf \
-  && ./configure --without-yat \
-  && $(MAKE) $(AM_MAKEFLAGS) dist \
-  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+  && autoreconf -if $(yat_dev_null) \
+  && ./configure --without-yat $(yat_dev_null) \
+  && $(MAKE) $(AM_MAKEFLAGS) dist $(yat_dev_null) \
+  && $(MAKE) $(AM_MAKEFLAGS) distclean $(yat_dev_null) \
   && mv yat-hello-1.0.tar.gz .. \
   && rm -rf $(yat_hello_tmp_files)