From 7d67517a3df3dd19824e7d2d319e427f2f66c138 Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Mon, 29 Sep 2025 09:48:46 +0200 Subject: [PATCH] fix out-of-tree build This mostly consists of prefixing with $(srcdir) where needed. --- autogen.sh | 2 ++ src/collector/Makefile.am | 2 +- src/ft2nfdump/Makefile.am | 2 +- src/libnfdump/Makefile.am | 2 +- src/libnffile/Makefile.am | 4 ++-- src/maxmind/Makefile.am | 2 +- src/netflow/Makefile.am | 2 +- src/nfanon/Makefile.am | 2 +- src/nfcapd/Makefile.am | 2 +- src/nfdump/Makefile.am | 2 +- src/nfexpire/Makefile.am | 2 +- src/nfpcapd/Makefile.am | 2 +- src/nfreader/Makefile.am | 2 +- src/nfreplay/Makefile.am | 2 +- src/nfsen/Makefile.am | 4 ++-- src/output/Makefile.am | 2 +- src/sflow/Makefile.am | 2 +- src/test/Makefile.am | 2 +- src/tor/Makefile.am | 2 +- 19 files changed, 22 insertions(+), 20 deletions(-) diff --git a/autogen.sh b/autogen.sh index 9fdcdce5..bab133d3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,6 +2,8 @@ set -e +cd $(dirname $0) + case "$(uname)" in Darwin) LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize} diff --git a/src/collector/Makefile.am b/src/collector/Makefile.am index 8f446f03..d36877b8 100755 --- a/src/collector/Makefile.am +++ b/src/collector/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline $(DEPS_CFLAGS) -D_BSD_SOURCE -D_DEFAULT_SOURCE +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) -D_BSD_SOURCE -D_DEFAULT_SOURCE EXTRA_DIST = collector_inline.c diff --git a/src/ft2nfdump/Makefile.am b/src/ft2nfdump/Makefile.am index 4523e667..c0450920 100755 --- a/src/ft2nfdump/Makefile.am +++ b/src/ft2nfdump/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) #AM_LDFLAGS = -L../lib bin_PROGRAMS = ft2nfdump diff --git a/src/libnfdump/Makefile.am b/src/libnfdump/Makefile.am index 8d6baaf8..5d0b24e0 100755 --- a/src/libnfdump/Makefile.am +++ b/src/libnfdump/Makefile.am @@ -2,7 +2,7 @@ BUILT_SOURCES = filter/grammar.h AM_YFLAGS = -d -AM_CPPFLAGS = -I.. -I../include -I../inline -I../libnffile -Idecode -Isgregex $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../inline -I$(srcdir)/../libnffile -I$(srcdir)/decode -I$(srcdir)/sgregex -I$(srcdir)/filter $(DEPS_CFLAGS) AM_CFLAGS = -ggdb LDADD = $(DEPS_LIBS) diff --git a/src/libnffile/Makefile.am b/src/libnffile/Makefile.am index 2fd1cdb9..9ce24712 100755 --- a/src/libnffile/Makefile.am +++ b/src/libnffile/Makefile.am @@ -1,6 +1,6 @@ BUILT_SOURCES = vcs_track.h -AM_CPPFLAGS = -I.. -I../include -I../inline -Iconf -Icompress $(DEPS_CFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../inline -I$(srcdir)/conf -I$(srcdir)/compress $(DEPS_CFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' AM_CFLAGS = -ggdb LDADD = $(DEPS_LIBS) @@ -26,7 +26,7 @@ version = version.c version.h barrier = barrier.c barrier.h vcs_track.h: Makefile - ./gen_version.sh + $(srcdir)/gen_version.sh lib_LTLIBRARIES = libnffile.la libnffile_la_SOURCES = $(conf) $(util) $(pidfile) $(compress) $(nffile) $(nflist) $(filter) $(output) $(regex) $(daemon) $(barrier) $(version) vcs_track.h diff --git a/src/maxmind/Makefile.am b/src/maxmind/Makefile.am index dcfcd750..1b99c678 100755 --- a/src/maxmind/Makefile.am +++ b/src/maxmind/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnfdump -I../libnffile -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnfdump -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) if MAXMIND bin_PROGRAMS = geolookup diff --git a/src/netflow/Makefile.am b/src/netflow/Makefile.am index 8b07fde5..add5d222 100755 --- a/src/netflow/Makefile.am +++ b/src/netflow/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../libnffile -I../include -I../collector -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../libnffile -I$(srcdir)/../include -I$(srcdir)/../collector -I$(srcdir)/../inline $(DEPS_CFLAGS) noinst_LIBRARIES = libnetflow.a diff --git a/src/nfanon/Makefile.am b/src/nfanon/Makefile.am index 947714a6..5c89bfae 100755 --- a/src/nfanon/Makefile.am +++ b/src/nfanon/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = nfanon -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) LDADD = $(DEPS_LIBS) diff --git a/src/nfcapd/Makefile.am b/src/nfcapd/Makefile.am index 388f9b05..e4fa3b79 100755 --- a/src/nfcapd/Makefile.am +++ b/src/nfcapd/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = nfcapd AM_CFLAGS = -ggdb -AM_CPPFLAGS = -I../include -I../libnffile -I../inline -I../netflow -I../collector $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline -I$(srcdir)/../netflow -I$(srcdir)/../collector $(DEPS_CFLAGS) nfcapd_SOURCES = nfcapd.c nfcapd_LDADD = ../netflow/libnetflow.a ../collector/libcollector.a -lnffile -lm diff --git a/src/nfdump/Makefile.am b/src/nfdump/Makefile.am index a97d4a16..7484fe0f 100755 --- a/src/nfdump/Makefile.am +++ b/src/nfdump/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = nfdump -AM_CPPFLAGS = -I.. -Icompat_1_6_x -I../include -I../libnffile -I../libnfdump -I../output -I../tor -I../netflow -I../collector -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/compat_1_6_x -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../libnfdump -I$(srcdir)/../output -I$(srcdir)/../tor -I$(srcdir)/../netflow -I$(srcdir)/../collector -I$(srcdir)/../inline $(DEPS_CFLAGS) AM_LDFLAGS = -L../libnfdump -L../libnffile EXTRA_DIST = memhandle.c diff --git a/src/nfexpire/Makefile.am b/src/nfexpire/Makefile.am index c7f0ca19..71c4c946 100755 --- a/src/nfexpire/Makefile.am +++ b/src/nfexpire/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = nfexpire -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../collector $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../collector $(DEPS_CFLAGS) LDADD = $(DEPS_LIBS) diff --git a/src/nfpcapd/Makefile.am b/src/nfpcapd/Makefile.am index 6e46c7c6..9f436a32 100755 --- a/src/nfpcapd/Makefile.am +++ b/src/nfpcapd/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = nfpcapd -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline -I../collector -I../netflow $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline -I$(srcdir)/../collector -I$(srcdir)/../netflow $(DEPS_CFLAGS) #AM_LDFLAGS = -L../lib LDADD = $(DEPS_LIBS) diff --git a/src/nfreader/Makefile.am b/src/nfreader/Makefile.am index 5c439fda..948d0faf 100755 --- a/src/nfreader/Makefile.am +++ b/src/nfreader/Makefile.am @@ -1,7 +1,7 @@ EXTRA_PROGRAMS = nfreader -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) LDADD = $(DEPS_LIBS) diff --git a/src/nfreplay/Makefile.am b/src/nfreplay/Makefile.am index 93a19a8c..0b8176ab 100755 --- a/src/nfreplay/Makefile.am +++ b/src/nfreplay/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = nfreplay -AM_CPPFLAGS = -I.. -I../include -I../libnfdump -I../libnffile -I../inline -I../collector -I../netflow $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnfdump -I$(srcdir)/../libnffile -I$(srcdir)/../inline -I$(srcdir)/../collector -I$(srcdir)/../netflow $(DEPS_CFLAGS) LDADD = $(DEPS_LIBS) diff --git a/src/nfsen/Makefile.am b/src/nfsen/Makefile.am index 026443f4..4336a354 100755 --- a/src/nfsen/Makefile.am +++ b/src/nfsen/Makefile.am @@ -1,6 +1,6 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../libnfdump -I../inline -I../collector -AM_CPPFLAGS += -I../libnffile/conf -I../libnfdump/maxmind -I../libnfdump/tor $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../libnfdump -I$(srcdir)/../inline -I$(srcdir)/../collector +AM_CPPFLAGS += -I$(srcdir)/../libnffile/conf -I$(srcdir)/../libnfdump/maxmind -I$(srcdir)/../libnfdump/tor $(DEPS_CFLAGS) bin_PROGRAMS = diff --git a/src/output/Makefile.am b/src/output/Makefile.am index e83d7cfc..0494c00c 100644 --- a/src/output/Makefile.am +++ b/src/output/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../libnfdump -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../libnfdump -I$(srcdir)/../inline $(DEPS_CFLAGS) noinst_LIBRARIES = liboutput.a diff --git a/src/sflow/Makefile.am b/src/sflow/Makefile.am index 97bc4a7b..01d72925 100755 --- a/src/sflow/Makefile.am +++ b/src/sflow/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = sfcapd -AM_CPPFLAGS = -I.. -I../include -I../libnffile -I../inline -I../collector $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnffile -I$(srcdir)/../inline -I$(srcdir)/../collector $(DEPS_CFLAGS) sflow = sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c sflow_process.h sfcapd_SOURCES = sfcapd.c \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 10859684..684e1a10 100755 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -20,7 +20,7 @@ TEST_BZIP2="$(TEST_BZIP2)"; export TEST_BZIP2 \ TEST_ZSTD="$(TEST_ZSTD)"; export TEST_ZSTD \ ; -AM_CPPFLAGS = -I.. -I../include -I../libnfdump -I../libnffile -I../inline -I../netflow -I../collector $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnfdump -I$(srcdir)/../libnffile -I$(srcdir)/../inline -I$(srcdir)/../netflow -I$(srcdir)/../collector $(DEPS_CFLAGS) AM_CFLAGS = -ggdb AM_LDFLAGS = -L../lib diff --git a/src/tor/Makefile.am b/src/tor/Makefile.am index c8aecefd..e973d6cc 100755 --- a/src/tor/Makefile.am +++ b/src/tor/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I.. -I../include -I../libnfdump -I../libnffile -I../inline $(DEPS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(srcdir)/../libnfdump -I$(srcdir)/../libnffile -I$(srcdir)/../inline $(DEPS_CFLAGS) if TORLOOKUP bin_PROGRAMS = torlookup