Changeset 2744


Ignore:
Timestamp:
Jun 8, 2012, 3:50:16 AM (8 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r2740 r2744  
    3434
    3535FORCE:
     36
     37## variable to used to switch between verbose output and silence
     38## yat_dev_null expands to empty string in verbose mode and to >
     39## /dev/null in silent mode, so 'echo hello $(yat_dev_null)' will
     40## display hello in verbose mode and being silent in silent mode.
     41yat_dev_null = $(yat_dev_null_$(V))
     42yat_dev_null_ = $(yat_dev_null_$(AM_DEFAULT_VERBOSITY))
     43yat_dev_null_0 = > /dev/null
    3644
    3745include build_support/Makefile.am
  • trunk/build_support/Makefile.am

    r2739 r2744  
    6464
    6565build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in
    66   @rm -f $@ $@.tmp
    67   @echo "#! $(SHELL)" > $@.tmp
    68   @echo "# $@ generated by make from yat-config.in" >> $@.tmp
    69   @$(edit) '$(srcdir)/$@.in' >>$@.tmp
    70   @chmod +x $@.tmp
    71   @chmod a-w $@.tmp
    72   @mv $@.tmp $@
    73   @echo creating $@
     66  @$(AM_V_GEN)rm -f $@ $@.tmp \
     67  && echo "#! $(SHELL)" > $@.tmp \
     68  && echo "# $@ generated by make from yat-config.in" >> $@.tmp \
     69  && $(edit) '$(srcdir)/$@.in' >>$@.tmp \
     70  && chmod +x $@.tmp \
     71  && chmod a-w $@.tmp \
     72  && mv $@.tmp $@
    7473
    7574build_support/for_installation/yat-config: build_support/yat-config
    76   @rm -f $@ $@-t \
     75  $(AM_V_GEN)rm -f $@ $@-t \
    7776  && $(MKDIR_P) build_support/for_installation \
    7877  && sed 's|installed=no|installed=yes|g' < build_support/yat-config > $@-t \
    79   && mv $@-t $@ && echo creating $@
     78  && mv $@-t $@
    8079
    8180build_support/yat.pc: $(srcdir)/build_support/yat.pc.in build_support/gen_yat_pc.sh Makefile
    82   rm -f $@ $@-t \
     81  $(AM_V_GEN)rm -f $@ $@-t \
    8382  && cd build_support \
    8483  && $(SHELL) gen_yat_pc.sh --prefix="$(prefix)" \
     
    8685  --libdir="$(libdir)" --includedir="$(includedir)" \
    8786  --input="../$(srcdir)/build_support/yat.pc.in" > yat.pc-t \
    88   && mv yat.pc-t yat.pc && echo creating $@
     87  && mv yat.pc-t yat.pc
  • trunk/doc/Makefile.am

    r2739 r2744  
    2525
    2626DOXYGEN_FILES = $(srcdir)/doc/build_tool.doxygen \
    27 $(builddir)/doc/first_page.doxygen \
    2827$(srcdir)/doc/deprecated.doxygen \
    2928$(srcdir)/doc/footer.html \
     
    3736DOXYGEN_INPUT += $(nobase_include_HEADERS)
    3837DOXYGEN_INPUT += $(nobase_nodist_include_HEADERS)
     38DOXYGEN_INPUT += $(builddir)/doc/first_page.doxygen
    3939
    4040DOXYGEN_DEPS = $(DOXYGEN_INPUT) doc/doxygen.config
     
    4545endif
    4646
    47 dx_dev_null = $(dx_dev_null_$(V))
    48 dx_dev_null_ = $(dx_dev_null_$(AM_DEFAULT_VERBOSITY))
    49 dx_dev_null_0 = > /dev/null
    50 
    5147doc/$(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
    5248  $(AM_V_GEN)
    5349  $(AM_V_at){ cat doc/doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
    54   echo GENERATE_HTML = YES; } | $(DOXYGEN) - $(dx_dev_null);
     50  echo GENERATE_HTML = YES; } | $(DOXYGEN) - $(yat_dev_null);
    5551
    5652install-data-hook: install-html
  • trunk/test/Makefile.am

    r2739 r2744  
    185185
    186186$(srcdir)/test/yat-hello-1.0.tar.gz: $(yat_hello_deps)
    187   cd $(srcdir)/test/yat-hello \
     187  $(AM_V_GEN)cd $(srcdir)/test/yat-hello \
    188188  && $(MKDIR_P) m4 \
    189189  && cp $(abs_top_srcdir)/m4/yat.m4 m4/ \
    190   && autoreconf -ivf \
    191   && ./configure --without-yat \
    192   && $(MAKE) $(AM_MAKEFLAGS) dist \
    193   && $(MAKE) $(AM_MAKEFLAGS) distclean \
     190  && autoreconf -if $(yat_dev_null) \
     191  && ./configure --without-yat $(yat_dev_null) \
     192  && $(MAKE) $(AM_MAKEFLAGS) dist $(yat_dev_null) \
     193  && $(MAKE) $(AM_MAKEFLAGS) distclean $(yat_dev_null) \
    194194  && mv yat-hello-1.0.tar.gz .. \
    195195  && rm -rf $(yat_hello_tmp_files)
Note: See TracChangeset for help on using the changeset viewer.