Merge remote-tracking branch 'origin/nfdump-ja4'

phaag · Mar 3, 2024 · 9c1021d · 9c1021d
2 parents 626be0b + cd9b43e
commit 9c1021d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src/lib src/output src/netflow src/collector src/maxmind src/decode src/nfdump src/nfcapd  
+SUBDIRS = src/lib src/output src/netflow src/collector src/decode src/maxmind src/nfdump src/nfcapd  
 SUBDIRS += src/nfanon src/nfexpire src/nfreplay . src src/test src/nfreader src/inline src/include
 
 if SFLOW

diff --git a/src/ft2nfdump/Makefile.am b/src/ft2nfdump/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = ft2nfdump
 
 ft2nfdump_SOURCES = ft2nfdump.c 
 ft2nfdump_CFLAGS = @FT_INCLUDES@
-ft2nfdump_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a  -lft -lz
+ft2nfdump_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../decode/libnfdecode.a  -lft -lz
 ft2nfdump_LDADD += @FT_LDFLAGS@
 
diff --git a/src/maxmind/Makefile.am b/src/maxmind/Makefile.am
@@ -12,7 +12,7 @@ libmaxmind_a_SOURCES = maxmind.c maxmind.h
 
 if MAXMIND
 geolookup_SOURCES = geolookup.c 
-geolookup_LDADD = ../lib/libnfdump.la libmaxmind.a
+geolookup_LDADD = ../lib/libnfdump.la libmaxmind.a ../decode/libnfdecode.a
 endif
 
 CLEANFILES = *.gch

diff --git a/src/nfanon/Makefile.am b/src/nfanon/Makefile.am
@@ -9,6 +9,6 @@ LDADD = $(DEPS_LIBS)
 anon = panonymizer.c panonymizer.h rijndael.c rijndael.h
 
 nfanon_SOURCES = nfanon.c $(anon)
-nfanon_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a
+nfanon_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../decode/libnfdecode.a
 
 CLEANFILES = *.gch
diff --git a/src/nfcapd/Makefile.am b/src/nfcapd/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I../include -I../lib -I../inline -I../netflow -I../collector -I..
 AM_LDFLAGS  = -Llib 
 
 nfcapd_SOURCES = nfcapd.c 
-nfcapd_LDADD = ../netflow/libnetflow.a ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a -lm
+nfcapd_LDADD = ../netflow/libnetflow.a ../lib/libnfdump.la ../maxmind/libmaxmind.a ../decode/libnfdecode.a ../collector/libcollector.a -lm
 nfcapd_LDFLAGS = -L../lib
 
 if READPCAP

diff --git a/src/nfexpire/Makefile.am b/src/nfexpire/Makefile.am
@@ -7,6 +7,6 @@ AM_LDFLAGS  = -L../lib
 LDADD = $(DEPS_LIBS)
 
 nfexpire_SOURCES = nfexpire.c 
-nfexpire_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a
+nfexpire_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../decode/libnfdecode.a ../collector/libcollector.a
 
 CLEANFILES = *.gch
diff --git a/src/sflow/Makefile.am b/src/sflow/Makefile.am
@@ -7,7 +7,7 @@ AM_LDFLAGS  = -L../lib
 sflow = sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c  sflow_process.h
 sfcapd_SOURCES = sfcapd.c \
 	$(sflow) $(launch) 
-sfcapd_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a -lm
+sfcapd_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../decode/libnfdecode.a ../collector/libcollector.a -lm
 
 if READPCAP
 sfcapd_CFLAGS = -DPCAP