Changeset 6c7e292 for lib

Timestamp:

11/11/04 17:36:35 (18 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:

7b82f21

Parents:

35902e3

Message:

added AM_CONDITIONAL test for dag

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)

lib/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h
-libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h @DAG_SOURCES@
-#dagapi.c dagopts.c
+if HAVE_DAG
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+else
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
+endif
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@

lib/Makefile.in

@@ -84 +84 @@
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h
-libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+@HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+@HAVE_DAG_FALSE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@
@@ -95 +96 @@
 
 libtrace_la_DEPENDENCIES =
-am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo \
-        libtrace_la-dagapi.lo libtrace_la-dagopts.lo
+@HAVE_DAG_TRUE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
+@HAVE_DAG_TRUE@ libtrace_la-fifo.lo libtrace_la-dagapi.lo \
+@HAVE_DAG_TRUE@ libtrace_la-dagopts.lo
+@HAVE_DAG_FALSE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
+@HAVE_DAG_FALSE@        libtrace_la-fifo.lo
 libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)