Changeset e2b0232


Ignore:
Timestamp:
08/28/06 14:47:52 (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:
4a4cc39
Parents:
90fd6b6
Message:

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

Location:
libpacketdump
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • libpacketdump/Makefile.am

    r9e528f6 re2b0232  
    9999ip_132_la_LDFLAGS=-module
    100100
    101 SUBDIRS = parser
    102 
    103 libpacketdump_la_SOURCES = libpacketdump.cc $(BIN_PROTOCOLS)
     101libpacketdump_la_SOURCES = libpacketdump.cc \
     102                        parser/lexer.l \
     103                        parser/parser.y \
     104                        parser/bitbuffer.c \
     105                        parser/bitbuffer.h \
     106                        parser/grammer.h
    104107
    105108plugin_LTLIBRARIES = $(BIN_PROTOCOLS)
     
    107110
    108111INCLUDES= @ADD_INCLS@ -I../lib -I../
    109 libpacketdump_la_LIBADD = @ADD_LIBS@ -lparser
     112libpacketdump_la_LIBADD = @ADD_LIBS@
    110113libpacketdump_la_LDFLAGS=\
    111114        -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \
     
    115118AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(INCLUDES)
    116119
     120EXTRA_DIST=lexer.l parser.y
     121BUILT_SOURCES=parser.h
     122AM_YFLAGS=-d
  • libpacketdump/parser/lexer.l

    r9461526 re2b0232  
    55%{
    66    #include <stdio.h>
    7     #include "grammar.h"
    8     #include "parser.h"
     7    #include "parser/grammar.h"
     8    #include "parser/parser.h"
    99
    1010    int yylex(void);
  • libpacketdump/parser/parser.h

    r9d6b5cd re2b0232  
    1 /* A Bison parser, made by GNU Bison 1.875d.  */
     1/* A Bison parser, made by GNU Bison 2.1.  */
    22
    33/* Skeleton parser for Yacc-like parsing with Bison,
    4    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     4   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    55
    66   This program is free software; you can redistribute it and/or modify
     
    1616   You should have received a copy of the GNU General Public License
    1717   along with this program; if not, write to the Free Software
    18    Foundation, Inc., 59 Temple Place - Suite 330,
    19    Boston, MA 02111-1307, USA.  */
     18   Foundation, Inc., 51 Franklin Street, Fifth Floor,
     19   Boston, MA 02110-1301, USA.  */
    2020
    2121/* As a special exception, when this file is copied by Bison into a
     
    4343   };
    4444#endif
     45/* Tokens.  */
    4546#define TOK_BIGENDIAN 258
    4647#define TOK_LITTLEENDIAN 259
     
    6566    element_t *ptr;
    6667} YYSTYPE;
    67 /* Line 1285 of yacc.c.  */
    68 #line 69 "parser.h"
     68/* Line 1447 of yacc.c.  */
     69#line 70 "parser.h"
    6970# define yystype YYSTYPE /* obsolescent; will be withdrawn */
    7071# define YYSTYPE_IS_DECLARED 1
  • libpacketdump/parser/parser.y

    r3dc2f61 re2b0232  
    77    #include <arpa/inet.h>
    88    #include <assert.h>
    9     #include "grammar.h"
     9    #include "parser/grammar.h"
    1010    #include "libpacketdump.h"
    11     #include "bitbuffer.h"
     11    #include "parser/bitbuffer.h"
    1212
    1313    #define YYERROR_VERBOSE 1
Note: See TracChangeset for help on using the changeset viewer.