Changeset da17570

Timestamp:

08/30/05 13:41:24 (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:

464266d

Parents:

53f8305

Message:

2.0.20

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• configure.in (modified) (3 diffs)
• lib/libtrace_int.h (modified) (1 diff)
• libtrace.doxygen (modified) (2 diffs)

ChangeLog

@@ -36 +36 @@
         * format conversion only applies if input not already in the right
           format
+        * move internal fifo* symbols to tracefifo* to prevent collision
+          with libfifo
 
 - Version 2.0.19 

Makefile.am

@@ -1 +1 @@
 SUBDIRS=lib
-man_MANS = docs/man/man3/[a-zA-Z]*.3
+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)
 
@@ -16 +17 @@
         rm -rf `find $(distdir)/examples -name CVS`
 
-docs/man/man3/[a-zA-Z]*.3:
+docs/man/man3/*.3:
         doxygen libtrace.doxygen
 

configure.in

@@ -2 +2 @@
 AC_INIT(libtrace,2.0.20,[libtrace@wand.net.nz],libtrace)
 AC_CONFIG_SRCDIR(lib/trace.c)
-AM_INIT_AUTOMAKE(libtrace,2.0.20)
+AM_INIT_AUTOMAKE
 
 AC_CONFIG_FILES([Makefile lib/Makefile])
@@ -112 +112 @@
 AC_CHECK_FUNCS(socket strdup)
 
+# configure time options for man pages
+AC_ARG_WITH(man,
+            AC_HELP_STRING([--with-man],
+                           [install man pages by default]),
+
+             if test "$withval" = yes
+             then
+                     MANPAGES="docs/man/man3/[a-zA-Z]*.3]"
+             else
+                     MANPAGES=""
+             fi
+)
 
 # configure time options for use of DAG cards
@@ -284 +296 @@
 AC_SUBST([ADD_INCLS])
 AC_SUBST([LTLIBOBJS])
+AC_SUBST([MANPAGES])
 
 dnl and finally, output our Makefiles

lib/libtrace_int.h

@@ -90 +90 @@
         } packet;
         double tdelta;
-//      double trace_start_ts;
-//      double real_start_ts;
         double trace_last_ts;
-
-//      double last_ts;
-//      double start_ts;
 };
 

libtrace.doxygen

@@ -64 +64 @@
 # If set to NO only classes defined in header files are included.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
@@ -72 +72 @@
 # This option has no effect if EXTRACT_ALL is enabled.
 
-HIDE_UNDOC_MEMBERS     = YES
+HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all