Changeset 80a6589


Ignore:
Timestamp:
10/10/05 16:25:16 (15 years ago)
Author:
Daniel Lawson <dlawson@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
47a9686
Parents:
9daf398
Message:

moving doxygen stuff round
created docs/Makefile.am
fixed some dag detection crazyness.

Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r1e66c64 r80a6589  
    3131- Version 2.0.22
    3232        * Documentation updates
    33         * Minor bugfixes
     33        * Added pcap_dump_flush() replacement function
     34        * Better doxygen detection
    3435
    3536- Version 2.0.21
  • Makefile.am

    rda17570 r80a6589  
    1 SUBDIRS=lib
    2 man_MANS = docs/man/man3/trace*.3 docs/man/man3/libtrace*.3 docs/man/man3/get*.3
     1SUBDIRS=lib docs
     2
     3AUTOMAKE_OPTIONS = 1.5
     4
     5
     6#man_MANS = docs/man/man3/trace*.3 docs/man/man3/libtrace*.3 docs/man/man3/get*.3
    37#man_MANS = @MANPAGES@
    4 EXTRA_DIST=examples docs/html docs/latex docs/man $(man_MANS)
     8EXTRA_DIST=examples
     9#docs/html docs/latex docs/man $(man_MANS)
    510
    611.PHONY: docs
     
    1722        rm -rf `find $(distdir)/examples -name CVS`
    1823
    19 docs/man/man3/*.3:
    20         doxygen libtrace.doxygen
     24#docs/man/man3/*.3:
     25#       doxygen libtrace.doxygen
    2126
    22 docs:
    23         doxygen libtrace.doxygen
     27#docs:
     28#       doxygen libtrace.doxygen
    2429
    2530install-man-hook: docs
  • configure.in

    r9daf398 r80a6589  
    44AM_INIT_AUTOMAKE
    55
    6 AC_CONFIG_FILES([Makefile lib/Makefile])
     6AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile])
    77dnl GNU C library
    88dnl AC_GNU_SOURCE
     
    145145        then
    146146                want_dag=yes
    147                 dag_root=
     147                dag_root=/root/dag
    148148        else
    149149                want_dag=yes
     
    155155        #
    156156        want_dag=ifpresent
    157         dag_root=
     157        dag_root=/root/dag/
    158158])
    159159
     
    162162if test "$with_dag" != no; then
    163163        AC_MSG_CHECKING(whether we have DAG API)
    164 
    165         if test -z "$dag_root"; then
    166                 dag_root=$srcdir/../dag
    167         fi
    168164
    169165        if test -r "$dag_root/lib"; then
     
    194190                        dag2_4=true
    195191                fi
     192               
     193                AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
     194                AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
    196195        else
    197                 ac_cv_lbl_dag_api=no
    198         fi
    199         AC_MSG_RESULT($ac_cv_lbl_dag_api)
    200         if test $ac_cv_lbl_dag_api = no; then
    201196                if test "$want_dag" = yes; then
    202197                        AC_MSG_ERROR(DAG API not found under directory $dag_root
    203198; use --without-dag)
    204199                fi
    205         else
    206                 AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
    207                 AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
     200                ac_cv_lbl_dag_api=no
    208201        fi
     202        AC_MSG_RESULT($ac_cv_lbl_dag_api)
    209203else
    210204        AC_DEFINE(HAVE_DAG,0,[conditional for building with DAG support])
     
    213207AM_CONDITIONAL(HAVE_DAG, test x$ac_cv_lbl_dag_api = xyes)
    214208AM_CONDITIONAL(DAG2_4, test x$dag2_4 = xtrue)
     209
     210
     211# Check for miscellaneous programs
     212AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false])
     213
     214AM_CONDITIONAL(HAS_DOXYGEN, [test x"$has_doxygen" = xtrue])
     215
     216
    215217
    216218# The following is commented out because it seems you don't actually
  • docs/libtrace.doxygen

    rda17570 r80a6589  
    3131# where doxygen was started. If left blank the current directory will be used.
    3232
    33 OUTPUT_DIRECTORY       = docs
     33OUTPUT_DIRECTORY       = doxygen
    3434
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all
     
    309309# with spaces.
    310310
    311 INPUT                  = lib
     311INPUT                  = ../lib
    312312
    313313# If the value of the INPUT tag contains directories, you can use the
  • lib/Makefile.am

    r9daf398 r80a6589  
    33
    44if DAG2_4
    5 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h format_template.c format_erf.c format_pcap.c format_wag.c format_helper.c format_helper.h parse_cmd.c parse_cmd.h libtrace_int.h dagopts.c dagapi.c
     5libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h format_template.c format_erf.c format_pcap.c format_wag.c format_helper.c format_helper.h parse_cmd.c parse_cmd.h libtrace_int.h
    66nodist_libtrace_la_SOURCES = dagopts.c dagapi.c
    77else
Note: See TracChangeset for help on using the changeset viewer.