Changeset 80a6589

Timestamp:

10/10/05 16:25:16 (16 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:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• configure.in (modified) (6 diffs)
• docs/Makefile.am (added)
• docs/libtrace.doxygen (moved) (moved from libtrace.doxygen) (2 diffs)
• lib/Makefile.am (modified) (1 diff)

ChangeLog

@@ -31 +31 @@
 - Version 2.0.22
         * Documentation updates
-        * Minor bugfixes
+        * Added pcap_dump_flush() replacement function
+        * Better doxygen detection
 
 - Version 2.0.21

Makefile.am

@@ -1 @@
-SUBDIRS=lib
-man_MANS = docs/man/man3/trace*.3 docs/man/man3/libtrace*.3 docs/man/man3/get*.3 
+SUBDIRS=lib docs
+
+AUTOMAKE_OPTIONS = 1.5
+
+
+#man_MANS = docs/man/man3/trace*.3 docs/man/man3/libtrace*.3 docs/man/man3/get*.3 
 #man_MANS = @MANPAGES@
-EXTRA_DIST=examples docs/html docs/latex docs/man $(man_MANS)
+EXTRA_DIST=examples 
+#docs/html docs/latex docs/man $(man_MANS)
 
 .PHONY: docs
@@ -17 +22 @@
         rm -rf `find $(distdir)/examples -name CVS`
 
-docs/man/man3/*.3:
-        doxygen libtrace.doxygen
+#docs/man/man3/*.3:
+#       doxygen libtrace.doxygen
 
-docs:
-        doxygen libtrace.doxygen
+#docs:
+#       doxygen libtrace.doxygen
 
 install-man-hook: docs

configure.in

@@ -4 +4 @@
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_FILES([Makefile lib/Makefile])
+AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile])
 dnl GNU C library
 dnl AC_GNU_SOURCE
@@ -145 +145 @@
         then
                 want_dag=yes
-                dag_root=
+                dag_root=/root/dag
         else
                 want_dag=yes
@@ -155 +155 @@
         #
         want_dag=ifpresent
-        dag_root=
+        dag_root=/root/dag/
 ])
 
@@ -162 +162 @@
 if test "$with_dag" != no; then
         AC_MSG_CHECKING(whether we have DAG API)
-
-        if test -z "$dag_root"; then
-                dag_root=$srcdir/../dag
-        fi
 
         if test -r "$dag_root/lib"; then
@@ -194 +190 @@
                         dag2_4=true
                 fi
+                
+                AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
+                AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
         else
-                ac_cv_lbl_dag_api=no
-        fi
-        AC_MSG_RESULT($ac_cv_lbl_dag_api)
-        if test $ac_cv_lbl_dag_api = no; then
                 if test "$want_dag" = yes; then
                         AC_MSG_ERROR(DAG API not found under directory $dag_root
 ; use --without-dag)
                 fi
-        else
-                AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
-                AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
+                ac_cv_lbl_dag_api=no
         fi
+        AC_MSG_RESULT($ac_cv_lbl_dag_api)
 else
         AC_DEFINE(HAVE_DAG,0,[conditional for building with DAG support])
@@ -213 +207 @@
 AM_CONDITIONAL(HAVE_DAG, test x$ac_cv_lbl_dag_api = xyes)
 AM_CONDITIONAL(DAG2_4, test x$dag2_4 = xtrue)
+
+
+# Check for miscellaneous programs
+AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false])
+
+AM_CONDITIONAL(HAS_DOXYGEN, [test x"$has_doxygen" = xtrue])
+
+
 
 # The following is commented out because it seems you don't actually

docs/libtrace.doxygen

@@ -31 +31 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = docs
+OUTPUT_DIRECTORY       = doxygen
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
@@ -309 +309 @@
 # with spaces.
 
-INPUT                  = lib
+INPUT                  = ../lib
 
 # If the value of the INPUT tag contains directories, you can use the 

lib/Makefile.am

@@ -3 +3 @@
 
 if DAG2_4
-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
+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
 nodist_libtrace_la_SOURCES = dagopts.c dagapi.c
 else