Changeset 4f666aa for libpacketdump

Timestamp:

09/11/06 13:33:27 (15 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:

• Makefile.am (modified) (3 diffs)
• bitbuffer.c (moved) (moved from libpacketdump/parser/bitbuffer.c) (1 diff)
• bitbuffer.h (moved) (moved from libpacketdump/parser/bitbuffer.h)
• grammar.h (moved) (moved from libpacketdump/parser/grammar.h)
• lexer.l (moved) (moved from libpacketdump/parser/lexer.l)
• libpacketdump.cc (modified) (1 diff)
• parser.y (moved) (moved from libpacketdump/parser/parser.y)

libpacketdump/Makefile.am

@@ -1 @@
-SUBDIRS=parser
 lib_LTLIBRARIES = libpacketdump.la
 include_HEADERS = libpacketdump.h
@@ -101 +100 @@
 
 libpacketdump_la_SOURCES = libpacketdump.cc \
-                        parser/libparser.la
+                        lexer.l parser.y bitbuffer.c bitbuffer.h grammar.h
 
 plugin_LTLIBRARIES = $(BIN_PROTOCOLS)
 dist_plugin_DATA = $(TXT_PROTOCOLS)
 
-INCLUDES= @ADD_INCLS@ -I../lib -I../
-libpacketdump_la_LIBADD = @ADD_LIBS@ parser/libparser.a @LIBFLEX@
+INCLUDES= @ADD_INCLS@ -I../lib 
+libpacketdump_la_LIBADD = @ADD_LIBS@ @LIBFLEX@
 libpacketdump_la_LDFLAGS=\
         -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \
@@ -113 +112 @@
 
 AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(INCLUDES)
-
+BUILT_SOURCES=parser.h
+AM_YFLAGS=-d
+EXTRA_DIST=lexer.l parser.y

libpacketdump/bitbuffer.c

@@ -7 +7 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
-#include "../libpacketdump.h"
+#include "libpacketdump.h"
 
 uint16_t bits;

libpacketdump/libpacketdump.cc

@@ -47 +47 @@
 #include "libpacketdump.h"
 extern "C"{
-#include "parser/grammar.h"
+#include "grammar.h"
 }