From 3f8fcdd306b3ff296e404888c895c960dd2d005f Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Fri, 28 Jun 2024 20:43:45 +0200 Subject: [PATCH] Cleanup Makefiles --- src/inline/Makefile.am | 2 +- src/libnfdump/Makefile.am | 6 +++--- src/nfdump/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/inline/Makefile.am b/src/inline/Makefile.am index beb7cb58..258f7bc3 100755 --- a/src/inline/Makefile.am +++ b/src/inline/Makefile.am @@ -1,3 +1,3 @@ -EXTRA_DIST = applybits_inline.c inline.c nfdump_inline.c nffile_inline.c \ No newline at end of file +EXTRA_DIST = inline.c nfdump_inline.c nffile_inline.c diff --git a/src/libnfdump/Makefile.am b/src/libnfdump/Makefile.am index 416808ff..c900d8c6 100755 --- a/src/libnfdump/Makefile.am +++ b/src/libnfdump/Makefile.am @@ -8,10 +8,10 @@ AM_CFLAGS = -ggdb LDADD = $(DEPS_LIBS) # libnfdump sources -filter = filter/grammar.y filter/scanner.l filter/filter.c filter/filter.h filter/ipconv.c filter/ipconv.h rbtree.h +filter = filter/grammar.y filter/scanner.l filter/filter.c filter/filter.h filter/ipconv.c filter/ipconv.h ../include/rbtree.h regex = sgregex/sgregex.c sgregex/sgregex.h decode = dns/dns.c dns/dns.h -decode += ssl/ssl.c ssl/ssl.h ja3/ja3.c ja3/ja3.h ja4/ja4.c ja4/ja4.h ja4/ja4s.h +decode += ssl/ssl.c ssl/ssl.h ja3/ja3.c ja3/ja3.h ja4/ja4.c ja4/ja4.h if JA4 decode += ja4/ja4s.c endif @@ -20,7 +20,7 @@ maxmind = maxmind/maxmind.c maxmind/maxmind.h maxmind/mmhash.c maxmind/mmhash.h tor = tor/tor.c tor/tor.h lib_LTLIBRARIES = libnfdump.la -libnfdump_la_SOURCES = $(filter) $(maxmind) $(tor) $(regex) $(decode) $(digest) vcs_track.h +libnfdump_la_SOURCES = $(filter) $(maxmind) $(tor) $(regex) $(decode) $(digest) ../libnffile/vcs_track.h libnfdump_la_LDFLAGS = -release @VERSION@ CLEANFILES = filter/lex.yy.c filter/grammar.c filter/grammar.h filter/scanner.c filter/scanner.h *.gch diff --git a/src/nfdump/Makefile.am b/src/nfdump/Makefile.am index 89f16dc1..a97d4a16 100755 --- a/src/nfdump/Makefile.am +++ b/src/nfdump/Makefile.am @@ -4,7 +4,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_LDFLAGS = -L../libnfdump -L../libnffile -EXTRA_DIST = nffile_compat.c memhandle.c heapsort_inline.c +EXTRA_DIST = memhandle.c LDADD = $(DEPS_LIBS)