Changeset 2224


Ignore:
Timestamp:
Mar 22, 2010, 8:47:09 PM (13 years ago)
Author:
Peter
Message:

Lift out rule generating doxygen.mk into one common place
'am/doxygen.am'. Modify the YAT_SVN_RELEASE so one can set the name of
outputfile and use that feature to place maintainer.am in new
directory 'am'.

Location:
trunk
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r2119 r2224  
    7070  && cd test && $(MAKE) $(AM_MAKEFLAGS) prefix=$$mcl_install yat_check_yat_test
    7171
    72 include $(srcdir)/maintainer.am
     72include $(srcdir)/am/maintainer.am

  • trunk/configure.ac

    r2222 r2224  
    390390AC_SUBST(AM_LDFLAGS)
    391391
    392 YAT_SVN_RELEASE
     392YAT_SVN_RELEASE([am/maintainer.am])
    393393
    394394# Create output.

  • trunk/doc/Makefile.am

    r2119 r2224  
    4141
    4242DOXYGEN_INPUT=$(classifier_doxygen_input) \
    43 $(normalizer_doxygen_input) \
    44 $(random_doxygen_input) \
    45 $(regression_doxygen_input) \
    46 $(statistics_doxygen_input) \
    47 $(utility_doxygen_input) \
     43$(yat_normalizer_doxygen_input) \
     44$(yat_random_doxygen_input) \
     45$(yat_regression_doxygen_input) \
     46$(yat_statistics_doxygen_input) \
     47$(yat_utility_doxygen_input) \
    4848$(DOXYGEN_FILES)
    4949

  • trunk/m4/yat_svn_release.m4

    r2202 r2224  
    11## $Id$
    22
    3 # serial 1 
     3# serial 2 
    44
    55# SYNOPSIS
    … …  
    4242  AC_REQUIRE([AC_PROG_EGREP])       
    4343  AC_CHECK_PROGS([MD5], [md5sum gmd5sum md5 md5deep], [no])
    44   m4_pushdef([YAT_OUTPUTFILE], [maintainer.am])
     44  m4_pushdef([YAT_OUTPUTFILE], [m4_default([$1], [maintainer.am])])
    4545
    46   AX_AC_PRINT_TO_FILE([maintainer.am],
     46  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE,
    4747[#  ]YAT_OUTPUTFILE[ generated by autoconf from $0
    4848]yat_svn_release_copyright[

  • trunk/yat/classifier/Makefile.am

    r2119 r2224  
    9696all-local: doxygen.mk
    9797
    98 doxygen.mk: Makefile.am
    99   echo "# generated by make" > $@ && \
    100   echo $(ECHO_N) "classifier_doxygen_input=$(ECHO_C)" >> $@ && \
    101   for f in $(include_classifier_HEADERS); do \
    102     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    103   done && \
    104   echo >> $@
     98DOXYGEN_INPUT=$(include_classifier_HEADERS)
    10599
     100include $(top_srcdir)/am/doxygen.am

  • trunk/yat/normalizer/Makefile.am

    r2161 r2224  
    3434all-local: doxygen.mk
    3535
    36 doxygen.mk: Makefile.am
    37   echo "# generated by make" > $@ && \
    38   echo $(ECHO_N) "normalizer_doxygen_input=$(ECHO_C)" >> $@ && \
    39   for f in $(include_normalizer_HEADERS); do \
    40     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    41   done && \
    42   echo >> $@
     36DOXYGEN_INPUT=$(include_normalizer_HEADERS)
    4337
     38include $(top_srcdir)/am/doxygen.am

  • trunk/yat/random/Makefile.am

    r2121 r2224  
    3535all-local: doxygen.mk
    3636
    37 doxygen.mk: Makefile.am
    38   echo "# generated by make" > $@ && \
    39   echo $(ECHO_N) "random_doxygen_input=$(ECHO_C)" >> $@ && \
    40   for f in $(include_random_HEADERS); do \
    41     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    42   done && \
    43   echo >> $@
     37DOXYGEN_INPUT=$(include_random_HEADERS)
    4438
     39include $(top_srcdir)/am/doxygen.am

  • trunk/yat/regression/Makefile.am

    r2121 r2224  
    4646all-local: doxygen.mk
    4747
    48 doxygen.mk: Makefile.am
    49   echo "# generated by make" > $@ && \
    50   echo $(ECHO_N) "regression_doxygen_input=$(ECHO_C)" >> $@ && \
    51   for f in $(include_regression_HEADERS); do \
    52     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    53   done && \
    54   echo >> $@
     48DOXYGEN_INPUT=$(include_regression_HEADERS)
    5549
     50include $(top_srcdir)/am/doxygen.am

  • trunk/yat/statistics/Makefile.am

    r2121 r2224  
    4646all-local: doxygen.mk
    4747
    48 doxygen.mk: Makefile.am
    49   echo "# generated by make" > $@ && \
    50   echo $(ECHO_N) "statistics_doxygen_input=$(ECHO_C)" >> $@ && \
    51   for f in $(include_statistics_HEADERS); do \
    52     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    53   done && \
    54   echo >> $@
     48DOXYGEN_INPUT=$(include_statistics_HEADERS)
    5549
     50include $(top_srcdir)/am/doxygen.am

  • trunk/yat/utility/Makefile.am

    r2209 r2224  
    5656all-local: doxygen.mk
    5757
    58 doxygen.mk: Makefile.am
    59   echo "# generated by make" > $@ && \
    60   echo $(ECHO_N) "utility_doxygen_input=$(ECHO_C)" >> $@ && \
    61   for f in $(include_utility_HEADERS); do \
    62     echo $(ECHO_N) "\$$(top_srcdir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    63   done && \
    64   for f in $(extra_headers_DATA); do \
    65     echo $(ECHO_N) "\$$(top_builddir)/$(subdir)/$$f $(ECHO_C)" >> $@; \
    66   done && \
    67   echo >> $@
     58DOXYGEN_INPUT=$(include_utility_HEADERS) $(extra_headers_DATA)
    6859
     60include $(top_srcdir)/am/doxygen.am
Note: See TracChangeset for help on using the changeset viewer.