Changeset e2b0232 for libpacketdump

Timestamp:

08/28/06 14:47:52 (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:

4a4cc39

Parents:

90fd6b6

Message:

Make parser build as part of libpacketdump rather than as a seperate library

Location:

libpacketdump

Files:

• Makefile.am (modified) (3 diffs)
• parser/Makefile.am (deleted)
• parser/lexer.l (modified) (1 diff)
• parser/parser.h (modified) (4 diffs)
• parser/parser.y (modified) (1 diff)

libpacketdump/Makefile.am

@@ -99 +99 @@
 ip_132_la_LDFLAGS=-module
 
-SUBDIRS = parser
-
-libpacketdump_la_SOURCES = libpacketdump.cc $(BIN_PROTOCOLS)
+libpacketdump_la_SOURCES = libpacketdump.cc \
+                        parser/lexer.l \
+                        parser/parser.y \
+                        parser/bitbuffer.c \
+                        parser/bitbuffer.h \
+                        parser/grammer.h
 
 plugin_LTLIBRARIES = $(BIN_PROTOCOLS)
@@ -107 +110 @@
 
 INCLUDES= @ADD_INCLS@ -I../lib -I../
-libpacketdump_la_LIBADD = @ADD_LIBS@ -lparser
+libpacketdump_la_LIBADD = @ADD_LIBS@ 
 libpacketdump_la_LDFLAGS=\
         -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \
@@ -115 +118 @@
 AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(INCLUDES)
 
+EXTRA_DIST=lexer.l parser.y
+BUILT_SOURCES=parser.h
+AM_YFLAGS=-d

libpacketdump/parser/lexer.l

@@ -5 +5 @@
 %{
     #include <stdio.h>
-    #include "grammar.h"
-    #include "parser.h"
+    #include "parser/grammar.h"
+    #include "parser/parser.h"
 
     int yylex(void);

libpacketdump/parser/parser.h

@@ -1 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
@@ -43 +43 @@
    };
 #endif
+/* Tokens.  */
 #define TOK_BIGENDIAN 258
 #define TOK_LITTLEENDIAN 259
@@ -65 +66 @@
     element_t *ptr;
 } YYSTYPE;
-/* Line 1285 of yacc.c.  */
-#line 69 "parser.h"
+/* Line 1447 of yacc.c.  */
+#line 70 "parser.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

libpacketdump/parser/parser.y

@@ -7 +7 @@
     #include <arpa/inet.h>
     #include <assert.h>
-    #include "grammar.h"
+    #include "parser/grammar.h"
     #include "libpacketdump.h"
-    #include "bitbuffer.h"
+    #include "parser/bitbuffer.h"
 
     #define YYERROR_VERBOSE 1