Changeset e5f1431


Ignore:
Timestamp:
05/04/06 14:15:52 (15 years ago)
Author:
Shane Alcock <salcock@…>
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:
431548c5
Parents:
81f9b6e
Message:

Updated build system to require version number changes in only two places
(format)_set_direction no longer takes a const libtrace_packet_t
Removed unnecessary #include <dagformat.h> from linktypes.c
libtrace.h and libtrace.doxygen are now .h.in files - a la libtrace2

Files:
7 edited
2 moved

Legend:

Unmodified
Added
Removed
  • configure.in

    r9d7d9e9 re5f1431  
    11# Process this file with autoconf to produce a configure script.
     2
     3# Now you only need to update the version number in two places - below,
     4# and in the README
     5
     6AC_INIT(libtrace,3.0.0,[contact@wand.net.nz],libtrace)
    27
    38LIBTRACE_MAJOR=3
     
    510LIBTRACE_MINOR=0
    611
    7 AC_INIT(libtrace,3.0.0,[contact@wand.net.nz],libtrace)
    812AC_CONFIG_SRCDIR(lib/trace.c)
    9 AM_INIT_AUTOMAKE(libtrace,3.0.0)
    10 
    11 AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile libpacketdump/Makefile tools/Makefile tools/traceanon/Makefile tools/tracedump/Makefile tools/tracemerge/Makefile tools/tracereport/Makefile tools/tracertstats/Makefile tools/tracesplit/Makefile tools/tracestats/Makefile ])
     13AM_INIT_AUTOMAKE
     14
     15AC_DEFINE([LIBTRACE_MAJOR],${LIBTRACE_MAJOR},[libtrace major version])
     16AC_DEFINE([LIBTRACE_MID],${LIBTRACE_MID},[libtrace mid version])
     17AC_DEFINE([LIBTRACE_MINOR],${LIBTRACE_MINOR},[libtrace minor version])
     18
     19AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile libpacketdump/Makefile
     20        tools/Makefile tools/traceanon/Makefile tools/tracedump/Makefile
     21        tools/tracemerge/Makefile tools/tracereport/Makefile
     22        tools/tracertstats/Makefile tools/tracesplit/Makefile
     23        tools/tracestats/Makefile docs/libtrace.doxygen lib/libtrace.h])
    1224dnl GNU C library
    1325dnl AC_GNU_SOURCE
     
    383395AC_SUBST([LTLIBOBJS])
    384396AC_SUBST([MANPAGES])
     397AC_SUBST([PACKAGE_VERSION])
     398AC_SUBST([LIBTRACE_MAJOR])
     399AC_SUBST([LIBTRACE_MID])
     400AC_SUBST([LIBTRACE_MINOR])
    385401
    386402dnl and finally, output our Makefiles
     
    395411}
    396412
     413AC_MSG_NOTICE([Libtrace version $PACKAGE_VERSION])
    397414reportopt "Compiled with BPF filter support" $libtrace_bpf
    398415reportopt "Compiled with PCAP support" $libtrace_pcap
  • docs/libtrace.doxygen.in

    r80a6589 re5f1431  
    2424# if some version control system is used.
    2525
    26 PROJECT_NUMBER         = 3.0
     26PROJECT_NUMBER         = @PACKAGE_VERSION@
    2727
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
  • lib/Makefile.am

    rc3e5f30 re5f1431  
    2424INCLUDES = @ADD_INCLS@
    2525libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
    26 libtrace_la_LDFLAGS=-version-info 3:0:0 @ADD_LDFLAGS@
     26libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
    2727
    2828dagapi.c:
  • lib/format_erf.c

    re6d963c re5f1431  
    781781}
    782782
    783 static int8_t erf_set_direction(const libtrace_packet_t *packet, int8_t direction) {
     783static int8_t erf_set_direction(libtrace_packet_t *packet, int8_t direction) {
    784784        dag_record_t *erfptr = 0;
    785785        erfptr = (dag_record_t *)packet->header;
  • lib/format_pcap.c

    r81f9b6e re5f1431  
    380380
    381381static int8_t pcap_get_direction(const libtrace_packet_t *packet) {
    382         int8_t direction  = -1;
     382        libtrace_direction_t direction  = -1;
    383383        switch(pcap_get_link_type(packet)) {
    384384                case TRACE_TYPE_LINUX_SLL:
  • lib/libtrace.h.in

    rc37ab9f re5f1431  
    2525 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2626 *
    27  * $Id$
     27 * $Id: libtrace.h 773 2006-05-01 12:58:09Z perry $
    2828 *
    2929 */
     
    3939 * @author Perry Lorier
    4040 *
    41  * @version $Id$
     41 * @version $Id: libtrace.h 773 2006-05-01 12:58:09Z perry $
    4242 *
    4343 * This library provides a per packet interface into a trace file, or a live
     
    101101
    102102/** API version as 2 byte hex digits, eg 0xXXYYZZ */
    103 #define LIBTRACE_API_VERSION 0x030000  /* 3.0.00 */
     103#define LIBTRACE_API_VERSION \
     104            ((@LIBTRACE_MAJOR@<<16)|(@LIBTRACE_MID@<<8)|(@LIBTRACE_MINOR@))
    104105
    105106#ifdef __cplusplus
  • lib/libtrace_int.h

    r81f9b6e re5f1431  
    244244         * @note This callback may be NULL if not supported.
    245245         */
    246         int8_t (*set_direction)(const libtrace_packet_t *packet, int8_t direction);
     246        int8_t (*set_direction)(libtrace_packet_t *packet, int8_t direction);
    247247        /** return the erf timestamp of the packet.
    248248         * @return the 64bit erf timestamp
  • lib/linktypes.c

    r81f9b6e re5f1431  
    44#include <pcap.h>
    55#endif
    6 #include "dagformat.h"
     6
    77#include "rt_protocol.h"
    88#include <assert.h>
  • libpacketdump/Makefile.am

    ra4bfbf0 re5f1431  
    1616INCLUDES= @ADD_INCLS@ -I../lib -I../
    1717libpacketdump_la_LIBADD = @ADD_LIBS@  -ldl
    18 libpacketdump_la_LDFLAGS=-version-info 3:0:0 @ADD_LDFLAGS@
     18libpacketdump_la_LDFLAGS=\
     19        -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \
     20        @ADD_LDFLAGS@
    1921
    2022AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(PLUGINDIR)\" -rdynamic $(INCLUDES)
Note: See TracChangeset for help on using the changeset viewer.