Attachment #695001 for bug #778704

View | Details | Raw Unified | Return to bug 778704
Collapse All | Expand All





nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
	$(nflowcache) $(nfprof)
nfdump_LDADD = libnfdump.la
nfdump_DEPENDENCIES = libnfdump.la

nfreplay_SOURCES = nfreplay.c $(nfprof) \
	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
nfreplay_LDADD = libnfdump.la
nfreplay_DEPENDENCIES = libnfdump.la

nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) 
nfprofile_LDADD = libnfdump.la -lrrd
nfprofile_DEPENDENCIES = libnfdump.la

nftrack_SOURCES = ../extra/nftrack/nftrack.c \
	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h 
nftrack_CFLAGS = -I ../extra/nftrack
nftrack_LDADD = libnfdump.la -lrrd
nftrack_DEPENDENCIES = libnfdump.la

nfcapd_SOURCES = nfcapd.c \
	$(nfstatfile) $(launch) \
	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
nfcapd_LDADD = libnfdump.la
nfcapd_DEPENDENCIES = libnfdump.la

nfpcapd_SOURCES = nfpcapd.c \
	$(pcaproc) $(netflow_pcap) \
	$(nfstatfile) $(launch) \
	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
nfpcapd_LDADD = libnfdump.la
nfpcapd_DEPENDENCIES = libnfdump.la

if READPCAP
nfcapd_CFLAGS = -DPCAP

sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c  sflow_process.h\
	$(nfstatfile) $(launch) \
	$(nfnet) $(collector) $(bookkeeper) $(expire)
sfcapd_LDADD = libnfdump.la
sfcapd_DEPENDENCIES = libnfdump.la

if READPCAP
sfcapd_CFLAGS = -DPCAP

endif

nfreader_SOURCES = nfreader.c 
nfreader_LDADD = libnfdump.la
nfreader_DEPENDENCIES = libnfdump.la

nfanon_SOURCES = nfanon.c $(anon)
nfanon_LDADD = libnfdump.la
nfanon_DEPENDENCIES = libnfdump.la

nfgen_SOURCES = nfgen.c 
nfgen_LDADD = libnfdump.la
nfgen_DEPENDENCIES = libnfdump.la

nfexpire_SOURCES = nfexpire.c \
	$(bookkeeper) $(expire) $(nfstatfile)
nfexpire_LDADD = libnfdump.la @FTS_OBJ@
nfexpire_DEPENDENCIES = libnfdump.la

nftest_SOURCES = nftest.c 
nftest_LDADD = libnfdump.la
nftest_DEPENDENCIES = nfgen

if FT2NFDUMP
ft2nfdump_SOURCES = ft2nfdump.c 
ft2nfdump_CFLAGS = @FT_INCLUDES@
ft2nfdump_LDADD = libnfdump.la -lft -lz
ft2nfdump_LDADD += @FT_LDFLAGS@
ft2nfdump_DEPENDENCIES = libnfdump.la
endif

check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c 

Return to bug 778704

Lines 68-104 libnfdump_la_LDFLAGS = -release 1.6.22 Link Here

(-)a/bin/Makefile.am (-26 / +14 lines)
68		68
69	nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \	69	nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \
70	$(nflowcache) $(nfprof)	70	$(nflowcache) $(nfprof)
71	nfdump_LDADD = -lnfdump	71	nfdump_LDADD = libnfdump.la
72	nfdump_DEPENDENCIES = libnfdump.la
73		72
74	nfreplay_SOURCES = nfreplay.c $(nfprof) \	73	nfreplay_SOURCES = nfreplay.c $(nfprof) \
75	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)	74	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
76	nfreplay_LDADD = -lnfdump	75	nfreplay_LDADD = libnfdump.la
77	nfreplay_DEPENDENCIES = libnfdump.la
78		76
79	nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile)	77	nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile)
80	nfprofile_LDADD = -lnfdump -lrrd	78	nfprofile_LDADD = libnfdump.la -lrrd
81	nfprofile_DEPENDENCIES = libnfdump.la
82		79
83	nftrack_SOURCES = ../extra/nftrack/nftrack.c \	80	nftrack_SOURCES = ../extra/nftrack/nftrack.c \
84	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \	81	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
85	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h	82	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h
86	nftrack_CFLAGS = -I ../extra/nftrack	83	nftrack_CFLAGS = -I ../extra/nftrack
87	nftrack_LDADD = -lnfdump -lrrd	84	nftrack_LDADD = libnfdump.la -lrrd
88	nftrack_DEPENDENCIES = libnfdump.la
89		85
90	nfcapd_SOURCES = nfcapd.c \	86	nfcapd_SOURCES = nfcapd.c \
91	$(nfstatfile) $(launch) \	87	$(nfstatfile) $(launch) \
92	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)	88	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
93	nfcapd_LDADD = -lnfdump	89	nfcapd_LDADD = libnfdump.la
94	nfcapd_DEPENDENCIES = libnfdump.la
95		90
96	nfpcapd_SOURCES = nfpcapd.c \	91	nfpcapd_SOURCES = nfpcapd.c \
97	$(pcaproc) $(netflow_pcap) \	92	$(pcaproc) $(netflow_pcap) \
98	$(nfstatfile) $(launch) \	93	$(nfstatfile) $(launch) \
99	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)	94	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
100	nfpcapd_LDADD = -lnfdump	95	nfpcapd_LDADD = libnfdump.la
101	nfpcapd_DEPENDENCIES = libnfdump.la
102		96
103	if READPCAP	97	if READPCAP
104	nfcapd_CFLAGS = -DPCAP	98	nfcapd_CFLAGS = -DPCAP
Lines 116-123 endif Link Here
116	sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c sflow_process.h\	110	sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c sflow_process.h\
117	$(nfstatfile) $(launch) \	111	$(nfstatfile) $(launch) \
118	$(nfnet) $(collector) $(bookkeeper) $(expire)	112	$(nfnet) $(collector) $(bookkeeper) $(expire)
119	sfcapd_LDADD = -lnfdump	113	sfcapd_LDADD = libnfdump.la
120	sfcapd_DEPENDENCIES = libnfdump.la
121		114
122	if READPCAP	115	if READPCAP
123	sfcapd_CFLAGS = -DPCAP	116	sfcapd_CFLAGS = -DPCAP
Lines 126-157 sfcapd_LDADD += -lpcap Link Here
126	endif	119	endif
127		120
128	nfreader_SOURCES = nfreader.c	121	nfreader_SOURCES = nfreader.c
129	nfreader_LDADD = -lnfdump	122	nfreader_LDADD = libnfdump.la
130	nfreader_DEPENDENCIES = libnfdump.la
131		123
132	nfanon_SOURCES = nfanon.c $(anon)	124	nfanon_SOURCES = nfanon.c $(anon)
133	nfanon_LDADD = -lnfdump	125	nfanon_LDADD = libnfdump.la
134	nfanon_DEPENDENCIES = libnfdump.la
135		126
136	nfgen_SOURCES = nfgen.c	127	nfgen_SOURCES = nfgen.c
137	nfgen_LDADD = -lnfdump	128	nfgen_LDADD = libnfdump.la
138	nfgen_DEPENDENCIES = libnfdump.la
139		129
140	nfexpire_SOURCES = nfexpire.c \	130	nfexpire_SOURCES = nfexpire.c \
141	$(bookkeeper) $(expire) $(nfstatfile)	131	$(bookkeeper) $(expire) $(nfstatfile)
142	nfexpire_LDADD = -lnfdump @FTS_OBJ@	132	nfexpire_LDADD = libnfdump.la @FTS_OBJ@
143	nfexpire_DEPENDENCIES = libnfdump.la
144		133
145	nftest_SOURCES = nftest.c	134	nftest_SOURCES = nftest.c
146	nftest_LDADD = -lnfdump	135	nftest_LDADD = libnfdump.la
147	nftest_DEPENDENCIES = nfgen libnfdump.la	136	nftest_DEPENDENCIES = nfgen
148		137
149	if FT2NFDUMP	138	if FT2NFDUMP
150	ft2nfdump_SOURCES = ft2nfdump.c	139	ft2nfdump_SOURCES = ft2nfdump.c
151	ft2nfdump_CFLAGS = @FT_INCLUDES@	140	ft2nfdump_CFLAGS = @FT_INCLUDES@
152	ft2nfdump_LDADD = -lnfdump -lft -lz	141	ft2nfdump_LDADD = libnfdump.la -lft -lz
153	ft2nfdump_LDADD += @FT_LDFLAGS@	142	ft2nfdump_LDADD += @FT_LDFLAGS@
154	ft2nfdump_DEPENDENCIES = libnfdump.la
155	endif	143	endif
156		144
157	check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c	145	check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c