Fix library dependencies on some *nix

phaag · Feb 17, 2024 · 9a0dddf · 9a0dddf
1 parent 2c987ee
commit 9a0dddf
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
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 -lft -lz
+ft2nfdump_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a  -lft -lz
 ft2nfdump_LDADD += @FT_LDFLAGS@
 
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
+nfanon_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.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 ../collector/libcollector.a -lm
+nfcapd_LDADD = ../netflow/libnetflow.a ../lib/libnfdump.la ../maxmind/libmaxmind.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 ../collector/libcollector.a
+nfexpire_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a
 
 CLEANFILES = *.gch
diff --git a/src/nfpcapd/Makefile.am b/src/nfpcapd/Makefile.am
@@ -13,7 +13,7 @@ pcaproc = pcaproc.c pcaproc.h nflog.h pflog.h flowtree.c flowtree.h
 
 nfpcapd_SOURCES = nfpcapd.c packet_pcap.c packet_pcap.h \
 	$(pcaproc) $(pcapdump) $(flowdump) $(flowsend)
-nfpcapd_LDADD = ../lib/libnfdump.la ../collector/libcollector.a -lm
+nfpcapd_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a -lm
 if BSDBPF
 nfpcapd_SOURCES += packet_bpf.c
 AM_CPPFLAGS += -DUSE_BPFSOCKET

diff --git a/src/nfreader/Makefile.am b/src/nfreader/Makefile.am
@@ -7,6 +7,6 @@ AM_LDFLAGS  = -L../lib
 LDADD = $(DEPS_LIBS)
 
 nfreader_SOURCES = nfreader.c 
-nfreader_LDADD = ../lib/libnfdump.la
+nfreader_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.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 ../collector/libcollector.a -lm
+sfcapd_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a ../collector/libcollector.a -lm
 
 if READPCAP
 sfcapd_CFLAGS = -DPCAP

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
@@ -27,7 +27,7 @@ AM_LDFLAGS  = -L../lib
 LDADD = $(DEPS_LIBS)
 
 nfgen_SOURCES = nfgen.c
-nfgen_LDADD = ../lib/libnfdump.la 
+nfgen_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a
 
 nftest_SOURCES = nftest.c 
 nftest_LDADD = ../lib/libnfdump.la ../maxmind/libmaxmind.a