Changeset 29262bb


Ignore:
Timestamp:
11/24/04 16:04:36 (16 years ago)
Author:
Daniel Lawson <dlawson@…>
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:
7abed19
Parents:
5e9d62d
Message:

p[oink

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • config.h

    r1f284e7 r29262bb  
    66
    77/* define if you have a DAG API */
    8 #define HAVE_DAG_API 1
     8/* #undef HAVE_DAG_API */
    99
    1010/* Define to 1 if you have the <dlfcn.h> header file. */
  • configure

    rdce95f3 r29262bb  
    88888888                ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
    88898889                #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
    8890                 #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
     8890                #ADD_SOURCES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
    88918891                ac_cv_lbl_dag_api=yes
    88928892        else
  • configure.in

    rdce95f3 r29262bb  
    103103                ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
    104104                #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
    105                 #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
     105                #ADD_SOURCES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
    106106                ac_cv_lbl_dag_api=yes
    107107        else
  • lib/Makefile.am

    rad7c782 r29262bb  
    22include_HEADERS = libtrace.h dagformat.h wag.h
    33if HAVE_DAG
    4 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     4libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
    55else
    66libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
  • lib/Makefile.in

    rdce95f3 r29262bb  
    8484lib_LTLIBRARIES = libtrace.la
    8585include_HEADERS = libtrace.h dagformat.h wag.h
    86 @HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     86@HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
    8787@HAVE_DAG_FALSE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
    8888libtrace_la_CFLAGS = @ADD_INCLS@
     
    9797libtrace_la_DEPENDENCIES =
    9898@HAVE_DAG_TRUE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
    99 @HAVE_DAG_TRUE@ libtrace_la-fifo.lo libtrace_la-dagapi.lo \
    100 @HAVE_DAG_TRUE@ libtrace_la-dagopts.lo
     99@HAVE_DAG_TRUE@ libtrace_la-fifo.lo
    101100@HAVE_DAG_FALSE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
    102101@HAVE_DAG_FALSE@        libtrace_la-fifo.lo
     
    109108LIBS = @LIBS@
    110109depcomp = $(SHELL) $(top_srcdir)/depcomp
    111 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-dagapi.Plo \
    112 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-dagopts.Plo \
    113 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-fifo.Plo \
     110@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-fifo.Plo \
    114111@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo
    115112COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     
    168165libtrace_la-trace.lo: trace.c
    169166libtrace_la-fifo.lo: fifo.c
    170 libtrace_la-dagapi.lo: dagapi.c
    171 libtrace_la-dagopts.lo: dagopts.c
    172167libtrace.la: $(libtrace_la_OBJECTS) $(libtrace_la_DEPENDENCIES)
    173168        $(LINK) -rpath $(libdir) $(libtrace_la_LDFLAGS) $(libtrace_la_OBJECTS) $(libtrace_la_LIBADD) $(LIBS)
     
    179174        -rm -f *.tab.c
    180175
    181 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagapi.Plo@am__quote@
    182 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagopts.Plo@am__quote@
    183176@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-fifo.Plo@am__quote@
    184177@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-trace.Plo@am__quote@
     
    240233@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    241234        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-fifo.lo `test -f fifo.c || echo '$(srcdir)/'`fifo.c
    242 
    243 libtrace_la-dagapi.o: dagapi.c
    244 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.o' libtool=no @AMDEPBACKSLASH@
    245 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
    246 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    247         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.o `test -f dagapi.c || echo '$(srcdir)/'`dagapi.c
    248 
    249 libtrace_la-dagapi.obj: dagapi.c
    250 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.obj' libtool=no @AMDEPBACKSLASH@
    251 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
    252 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    253         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.obj `cygpath -w dagapi.c`
    254 
    255 libtrace_la-dagapi.lo: dagapi.c
    256 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.lo' libtool=yes @AMDEPBACKSLASH@
    257 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPlo' @AMDEPBACKSLASH@
    258 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    259         $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.lo `test -f dagapi.c || echo '$(srcdir)/'`dagapi.c
    260 
    261 libtrace_la-dagopts.o: dagopts.c
    262 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.o' libtool=no @AMDEPBACKSLASH@
    263 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
    264 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    265         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.o `test -f dagopts.c || echo '$(srcdir)/'`dagopts.c
    266 
    267 libtrace_la-dagopts.obj: dagopts.c
    268 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.obj' libtool=no @AMDEPBACKSLASH@
    269 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
    270 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    271         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.obj `cygpath -w dagopts.c`
    272 
    273 libtrace_la-dagopts.lo: dagopts.c
    274 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.lo' libtool=yes @AMDEPBACKSLASH@
    275 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPlo' @AMDEPBACKSLASH@
    276 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    277         $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.lo `test -f dagopts.c || echo '$(srcdir)/'`dagopts.c
    278235CCDEPMODE = @CCDEPMODE@
    279236uninstall-info-am:
  • lib/trace.c

    rdce95f3 r29262bb  
    8181#include "libtrace.h"
    8282#include "fifo.h"
    83 
    84 #define HAVE_BPF 0
    85 #define HAVE_PCAP 0
    86 #define HAVE_ZLIB 0
    87 #define DAGDEVICE 0
    8883
    8984#if HAVE_PCAP_BPF_H
Note: See TracChangeset for help on using the changeset viewer.