Changeset 781


Ignore:
Timestamp:
05/04/06 14:15:52 (7 years ago)
Author:
spa1
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

Location:
trunk
Files:
2 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.in

    r758 r781  
    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 

  • trunk/lib/Makefile.am

    r743 r781  
    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: 

  • trunk/lib/format_erf.c

    r770 r781  
    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; 

  • trunk/lib/format_pcap.c

    r780 r781  
    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: 

  • trunk/lib/libtrace_int.h

    r780 r781  
    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 

  • trunk/lib/linktypes.c

    r780 r781  
    44#include <pcap.h> 
    55#endif 
    6 #include "dagformat.h" 
     6 
    77#include "rt_protocol.h" 
    88#include <assert.h> 

  • trunk/libpacketdump/Makefile.am

    r721 r781  
    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.