Changeset fb1de29


Ignore:
Timestamp:
02/22/05 13:17:27 (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:
cb8c1b9
Parents:
850630f
Message:

some changes in libtrace wrt new dag api

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r68d4cd7 rfb1de29  
    3939top_builddir = .
    4040
    41 ACLOCAL = ${SHELL} /home/dlawson/code/libtrace/missing --run aclocal
    42 AUTOCONF = ${SHELL} /home/dlawson/code/libtrace/missing --run autoconf
    43 AUTOMAKE = ${SHELL} /home/dlawson/code/libtrace/missing --run automake
    44 AUTOHEADER = ${SHELL} /home/dlawson/code/libtrace/missing --run autoheader
     41ACLOCAL = ${SHELL} /usr/local/src/libtrace/missing --run aclocal
     42AUTOCONF = ${SHELL} /usr/local/src/libtrace/missing --run autoconf
     43AUTOMAKE = ${SHELL} /usr/local/src/libtrace/missing --run automake
     44AUTOHEADER = ${SHELL} /usr/local/src/libtrace/missing --run autoheader
    4545
    4646INSTALL = /usr/bin/install -c
    … …  
    5858host_alias =
    5959host_triplet = i686-pc-linux-gnu
    60 ADD_INCLS =
    61 ADD_LDFLAGS =  -L/usr/local/wand/lib/ -L/usr/local/wand/lib/
    62 ADD_LIBS =   -lpcapl -lzl
    63 AMTAR = ${SHELL} /home/dlawson/code/libtrace/missing --run tar
     60ADD_INCLS =  -I /usr/local/dag/include
     61ADD_LDFLAGS =  -L/usr/local/dag/lib -L/usr/lib -L/usr/local/lib
     62ADD_LIBS =  -ldag  -lpcap -lzl
     63AMTAR = ${SHELL} /usr/local/src/libtrace/missing --run tar
    6464AS = @AS@
    6565AWK = mawk
    6666CC = gcc
    67 DAG_TOOLS_DIR =
     67DAG_TOOLS_DIR = /usr/local/dag/tools
    6868DEPDIR = .deps
    6969DLLTOOL = @DLLTOOL@
    … …  
    8181am__include = include
    8282am__quote =
    83 install_sh = /home/dlawson/code/libtrace/install-sh
     83install_sh = /usr/local/src/libtrace/install-sh
    8484
    8585SUBDIRS = replace lib

  • config.h

    r68d4cd7 rfb1de29  
    33
    44/* Define to 1 if you have the <dagapi.h> header file. */
    5 /* #undef HAVE_DAGAPI_H */
     5#define HAVE_DAGAPI_H 1
    66
    77/* define if you have a DAG API */
    8 /* #undef HAVE_DAG_API */
     8#define HAVE_DAG_API 1
    99
    1010/* Define to 1 if you have the <dlfcn.h> header file. */
    … …  
    1515
    1616/* Define to 1 if you have the <libxml2/libxml/parser.h> header file. */
    17 #define HAVE_LIBXML2_LIBXML_PARSER_H 1
     17/* #undef HAVE_LIBXML2_LIBXML_PARSER_H */
    1818
    1919/* Define to 1 if you have the <libxml/parser.h> header file. */

  • lib/Makefile.am

    r3fe7937 rfb1de29  
    11lib_LTLIBRARIES = libtrace.la
    22include_HEADERS = libtrace.h dagformat.h wag.h
    3 if HAVE_DAG
    4 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
    5 else
     3#if HAVE_DAG
     4#libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     5#else
    66libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
    7 endif
     7#endif
    88libtrace_la_CFLAGS = @ADD_INCLS@
    99libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a

  • lib/Makefile.in

    r3fe7937 rfb1de29  
    8585lib_LTLIBRARIES = libtrace.la
    8686include_HEADERS = libtrace.h dagformat.h wag.h
    87 @HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
    88 @HAVE_DAG_FALSE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
     87#if HAVE_DAG
     88#libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     89#else
     90libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
     91#endif
    8992libtrace_la_CFLAGS = @ADD_INCLS@
    9093libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
    … …  
    97100
    98101libtrace_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.a
    99 @HAVE_DAG_TRUE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
    100 @HAVE_DAG_TRUE@ libtrace_la-fifo.lo libtrace_la-dagapi.lo \
    101 @HAVE_DAG_TRUE@ libtrace_la-dagopts.lo
    102 @HAVE_DAG_FALSE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
    103 @HAVE_DAG_FALSE@        libtrace_la-fifo.lo
     102am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo
    104103libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)
    105104
    … …  
    110109LIBS = @LIBS@
    111110depcomp = $(SHELL) $(top_srcdir)/depcomp
    112 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-dagapi.Plo \
    113 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-dagopts.Plo \
    114 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-fifo.Plo \
     111@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-fifo.Plo \
    115112@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo
    116113COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    … …  
    169166libtrace_la-trace.lo: trace.c
    170167libtrace_la-fifo.lo: fifo.c
    171 libtrace_la-dagapi.lo: dagapi.c
    172 libtrace_la-dagopts.lo: dagopts.c
    173168libtrace.la: $(libtrace_la_OBJECTS) $(libtrace_la_DEPENDENCIES)
    174169        $(LINK) -rpath $(libdir) $(libtrace_la_LDFLAGS) $(libtrace_la_OBJECTS) $(libtrace_la_LIBADD) $(LIBS)
    … …  
    180175        -rm -f *.tab.c
    181176
    182 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagapi.Plo@am__quote@
    183 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagopts.Plo@am__quote@
    184177@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-fifo.Plo@am__quote@
    185178@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-trace.Plo@am__quote@
    … …  
    241234@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    242235        $(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
    243 
    244 libtrace_la-dagapi.o: dagapi.c
    245 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.o' libtool=no @AMDEPBACKSLASH@
    246 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
    247 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    248         $(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
    249 
    250 libtrace_la-dagapi.obj: dagapi.c
    251 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.obj' libtool=no @AMDEPBACKSLASH@
    252 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
    253 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    254         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.obj `cygpath -w dagapi.c`
    255 
    256 libtrace_la-dagapi.lo: dagapi.c
    257 @AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.lo' libtool=yes @AMDEPBACKSLASH@
    258 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPlo' @AMDEPBACKSLASH@
    259 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    260         $(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
    261 
    262 libtrace_la-dagopts.o: dagopts.c
    263 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.o' libtool=no @AMDEPBACKSLASH@
    264 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
    265 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    266         $(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
    267 
    268 libtrace_la-dagopts.obj: dagopts.c
    269 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.obj' libtool=no @AMDEPBACKSLASH@
    270 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
    271 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    272         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.obj `cygpath -w dagopts.c`
    273 
    274 libtrace_la-dagopts.lo: dagopts.c
    275 @AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.lo' libtool=yes @AMDEPBACKSLASH@
    276 @AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPlo' @AMDEPBACKSLASH@
    277 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    278         $(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
    279236CCDEPMODE = @CCDEPMODE@
    280237uninstall-info-am:

  • libtool

    r68d4cd7 rfb1de29  
    3636# ### BEGIN LIBTOOL CONFIG
    3737
    38 # Libtool was configured on host voodoo:
     38# Libtool was configured on host wand-pma:
    3939
    4040# Shell to use when invoking shell scripts.
Note: See TracChangeset for help on using the changeset viewer.