Changeset 4f666aa


Ignore:
Timestamp:
09/11/06 13:33:27 (14 years ago)
Author:
Perry Lorier <perry@…>
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:
11346a5
Parents:
e0f9c80
Message:

Try a new build system for libpacket dump (move everything in
libpacketdump/parser/ into libpacketdump/)

Location:
libpacketdump
Files:
2 edited
5 moved

Legend:

Unmodified
Added
Removed
  • libpacketdump/Makefile.am

    rcecb45b r4f666aa  
    1 SUBDIRS=parser
    21lib_LTLIBRARIES = libpacketdump.la
    32include_HEADERS = libpacketdump.h
     
    101100
    102101libpacketdump_la_SOURCES = libpacketdump.cc \
    103                         parser/libparser.la
     102                        lexer.l parser.y bitbuffer.c bitbuffer.h grammar.h
    104103
    105104plugin_LTLIBRARIES = $(BIN_PROTOCOLS)
    106105dist_plugin_DATA = $(TXT_PROTOCOLS)
    107106
    108 INCLUDES= @ADD_INCLS@ -I../lib -I../
    109 libpacketdump_la_LIBADD = @ADD_LIBS@ parser/libparser.a @LIBFLEX@
     107INCLUDES= @ADD_INCLS@ -I../lib
     108libpacketdump_la_LIBADD = @ADD_LIBS@ @LIBFLEX@
    110109libpacketdump_la_LDFLAGS=\
    111110        -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \
     
    113112
    114113AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(INCLUDES)
    115 
     114BUILT_SOURCES=parser.h
     115AM_YFLAGS=-d
     116EXTRA_DIST=lexer.l parser.y
  • libpacketdump/bitbuffer.c

    r6a18893 r4f666aa  
    77#include <stdlib.h>
    88#include <arpa/inet.h>
    9 #include "../libpacketdump.h"
     9#include "libpacketdump.h"
    1010
    1111uint16_t bits;
  • libpacketdump/libpacketdump.cc

    r90fd6b6 r4f666aa  
    4747#include "libpacketdump.h"
    4848extern "C"{
    49 #include "parser/grammar.h"
     49#include "grammar.h"
    5050}
    5151
Note: See TracChangeset for help on using the changeset viewer.