Changeset 60f3c4c for lib


Ignore:
Timestamp:
03/06/12 15:36:43 (9 years ago)
Author:
Shane Alcock <salcock@…>
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:
1d4db58
Parents:
bd6576d
Message:
  • Shifted wandio into a separate library, seeing as we're going to be exporting the API now
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    r8753bb8 r60f3c4c  
    11lib_LTLIBRARIES = libtrace.la
    2 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h wandio.h
     2include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h
    33
    44AM_CFLAGS=@LIBCFLAGS@
     
    1616else
    1717BPFFORMATS=
    18 endif
    19 
    20 if HAVE_ZLIB
    21 LIBTRACEIO_ZLIB=ior-zlib.c iow-zlib.c
    22 else
    23 LIBTRACEIO_ZLIB=
    24 endif
    25 
    26 if HAVE_BZLIB
    27 LIBTRACEIO_BZLIB=ior-bzip.c iow-bzip.c
    28 else
    29 LIBTRACEIO_BZLIB=
    30 endif
    31 
    32 if HAVE_LZO
    33 LIBTRACEIO_LZO=iow-lzo.c
    34 else
    35 LIBTRACEIO_LZO=
    3618endif
    3719
     
    6547                $(DAGSOURCE) format_erf.h \
    6648                $(BPFJITSOURCE) \
    67                 $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO) \
    68                 ior-peek.c ior-stdio.c ior-thread.c \
    69                 iow-stdio.c iow-thread.c wandio.c \
    70                 wandio.h arphrd.h
     49                arphrd.h
    7150
    7251if DAG2_4
     
    7453endif
    7554
    76 INCLUDES = @ADD_INCLS@
     55INCLUDES= @ADD_INCLS@ -I../libwandio
    7756libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@
    7857libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
Note: See TracChangeset for help on using the changeset viewer.