Skip to content

fix out-of-tree build #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix out-of-tree build #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -e

cd $(dirname $0)

case "$(uname)" in
Darwin)
LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize}
Expand Down
2 changes: 1 addition & 1 deletion src/collector/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/ft2nfdump/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/libnfdump/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/libnffile/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/maxmind/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/netflow/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/nfanon/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/nfcapd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nfdump/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nfexpire/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/nfpcapd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/nfreader/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/nfreplay/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions src/nfsen/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =

Expand Down
2 changes: 1 addition & 1 deletion src/output/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/sflow/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/tor/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down