Cleanup Makefiles

src/inline/Makefile.am

@@ -1,3 +1,3 @@
 
 
-EXTRA_DIST = applybits_inline.c inline.c nfdump_inline.c nffile_inline.c
+EXTRA_DIST = inline.c nfdump_inline.c nffile_inline.c

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

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)