Changeset d420777 for lib/Makefile.am


Ignore:
Timestamp:
08/19/15 13:37:05 (6 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
461582b
Parents:
c24de65 (diff), 6210f82 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote branch 'parallel/develop' into libtrace4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    r3a333e2 rd420777  
    11lib_LTLIBRARIES = libtrace.la
    2 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h  
     2include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h libtrace_parallel.h
    33
    4 AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@
    5 AM_CXXFLAGS=@LIBCXXFLAGS@ @CFLAG_VISIBILITY@
     4AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@ -pthread
     5AM_CXXFLAGS=@LIBCXXFLAGS@ @CFLAG_VISIBILITY@ -pthread
    66
    77extra_DIST = format_template.c
    8 NATIVEFORMATS=format_linux.c
     8NATIVEFORMATS=format_linux_common.c format_linux_ring.c format_linux_int.c format_linux_common.h
    99BPFFORMATS=format_bpf.c
    1010
     
    2929NATIVEFORMATS+= format_dpdk.c
    3030# So we also make libtrace.mk in dpdk otherwise automake tries to expand
    31 # it to early which I cannot seem to stop unless we use a path that
     31# it too early which I cannot seem to stop unless we use a path that
    3232# doesn't exist currently
    3333export RTE_SDK=@RTE_SDK@
     
    4444endif
    4545
    46 libtrace_la_SOURCES = trace.c common.h \
     46libtrace_la_SOURCES = trace.c trace_parallel.c common.h \
    4747                format_erf.c format_pcap.c format_legacy.c \
    4848                format_rt.c format_helper.c format_helper.h format_pcapfile.c \
     
    5757                $(DAGSOURCE) format_erf.h \
    5858                $(BPFJITSOURCE) \
    59                 libtrace_arphrd.h
     59                libtrace_arphrd.h \
     60                data-struct/ring_buffer.c data-struct/vector.c \
     61                data-struct/message_queue.c data-struct/deque.c \
     62                data-struct/sliding_window.c data-struct/object_cache.c \
     63                data-struct/linked_list.c hash_toeplitz.c combiner_ordered.c \
     64                combiner_sorted.c combiner_unordered.c \
     65                pthread_spinlock.c pthread_spinlock.h
    6066
    6167if DAG2_4
Note: See TracChangeset for help on using the changeset viewer.