Add nfdump library. Fix fragments iin sflow

ChangeLog

@@ -1,3 +1,7 @@
+2015-12-23
+- Fix IP Fragmentation in sflow collector
+- Create libnfdump for dynamic linking
+
 2015-10-02
 - Fix compile errors on other platforms
 - Add -R to ModifyCompression

Makefile.in

@@ -85,6 +85,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -156,8 +158,8 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS README.md compile depcomp \
-	install-sh missing ylwrap
+	COPYING ChangeLog INSTALL NEWS README compile config.guess \
+	config.sub install-sh ltmain.sh missing ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -203,6 +205,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -215,11 +218,15 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 FTS_OBJ = @FTS_OBJ@
 FT_INCLUDES = @FT_INCLUDES@
 FT_LDFLAGS = @FT_LDFLAGS@
@@ -229,6 +236,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -236,10 +244,20 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LFLAGS = @LFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -248,7 +266,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
 RRD_LIBS = @RRD_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -259,21 +279,31 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -298,7 +328,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = . bin man
-EXTRA_DIST = CreateSubHierarchy.pl BSD-license.txt extra/PortTracker.pm extra/nfdump.spec bootstrap flows
+EXTRA_DIST = CreateSubHierarchy.pl LICENSE BSD-license.txt extra/PortTracker.pm extra/nfdump.spec bootstrap flows
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -352,6 +382,15 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 distclean-hdr:
 	-rm -f config.h stamp-h1
 
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
@@ -683,12 +722,13 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -738,7 +778,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
@@ -754,18 +794,19 @@ uninstall-am:
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
 .PRECIOUS: Makefile

README

@@ -0,0 +1 @@
+README.md

autom4te.cache/requests

@@ -34,47 +34,47 @@
                         'configure.ac'
                       ],
                       {
-                        'AU_DEFUN' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_RUN_LOG' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_DEFUN' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_m4_warn' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'include' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'include' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        'AU_DEFUN' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_DEFUN' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        '_m4_warn' => 1,
                         'm4_include' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_IF_OPTION' => 1,
+                        '_AM_PROG_TAR' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_SET_OPTIONS' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -89,65 +89,284 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_GNU_GETTEXT' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'AM_PROG_MKDIR_P' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'sinclude' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
                         'AC_SUBST' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AM_POT_TOOLS' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'include' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        '_AM_COND_ENDIF' => 1,
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'm4_sinclude' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        '_m4_warn' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'm4_include' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_INIT' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'LT_INIT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_FC_FREEFORM' => 1,
                         'AM_NLS' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'include' => 1,
+                        'AC_INIT' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'LT_INIT' => 1,
+                        'm4_include' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'AM_SILENT_RULES' => 1
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_PROG_MOC' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_PROG_AR' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '2',
+                      1,
+                      [
+                        '/opt/local/share/autoconf'
+                      ],
+                      [
+                        '/opt/local/share/autoconf/autoconf/autoconf.m4f',
+                        '-',
+                        '/opt/local/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
+                        '/opt/local/share/aclocal/libtool.m4',
+                        '/opt/local/share/aclocal/ltargz.m4',
+                        '/opt/local/share/aclocal/ltdl.m4',
+                        '/opt/local/share/aclocal/ltoptions.m4',
+                        '/opt/local/share/aclocal/ltsugar.m4',
+                        '/opt/local/share/aclocal/ltversion.m4',
+                        '/opt/local/share/aclocal/lt~obsolete.m4',
+                        '/opt/local/share/aclocal-1.15/amversion.m4',
+                        '/opt/local/share/aclocal-1.15/auxdir.m4',
+                        '/opt/local/share/aclocal-1.15/cond.m4',
+                        '/opt/local/share/aclocal-1.15/depend.m4',
+                        '/opt/local/share/aclocal-1.15/depout.m4',
+                        '/opt/local/share/aclocal-1.15/init.m4',
+                        '/opt/local/share/aclocal-1.15/install-sh.m4',
+                        '/opt/local/share/aclocal-1.15/lead-dot.m4',
+                        '/opt/local/share/aclocal-1.15/make.m4',
+                        '/opt/local/share/aclocal-1.15/missing.m4',
+                        '/opt/local/share/aclocal-1.15/options.m4',
+                        '/opt/local/share/aclocal-1.15/prog-cc-c-o.m4',
+                        '/opt/local/share/aclocal-1.15/runlog.m4',
+                        '/opt/local/share/aclocal-1.15/sanity.m4',
+                        '/opt/local/share/aclocal-1.15/silent.m4',
+                        '/opt/local/share/aclocal-1.15/strip.m4',
+                        '/opt/local/share/aclocal-1.15/substnot.m4',
+                        '/opt/local/share/aclocal-1.15/tar.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'AC_PROG_LD' => 1,
+                        'm4_include' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AU_DEFUN' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'include' => 1,
+                        'LT_LANG' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_LT_PROG_FC' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LTDL_SETUP' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'LTDL_INIT' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_PROG_NM' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'LT_PATH_LD' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'LT_LIB_M' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_PROG_NM' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AC_DEFUN' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        '_LT_WITH_SYSROOT' => 1
                       }
                     ], 'Autom4te::Request' )
            );

bin/Makefile.am

@@ -30,11 +30,14 @@ LDADD = $(DEPS_LIBS)
 #Add extra debug info for gdb
 AM_CFLAGS = -ggdb 
 
+# libnfdump sources
 common =  nf_common.c nf_common.h 
 util = util.c util.h
 filelzo = minilzo.c minilzo.h lzoconf.h lzodefs.h nffile.c nffile.h nfx.c nfx.h nfxstat.h nfxstat.c 
 nflist = flist.c flist.h fts_compat.c fts_compat.h
 filter = grammar.y scanner.l nftree.c nftree.h ipconv.c ipconv.h rbtree.h
+exporter = exporter.c exporter.h
+
 nfprof = nfprof.c nfprof.h
 nfnet = nfnet.c nfnet.h
 anon = panonymizer.c panonymizer.h rijndael.c rijndael.h
@@ -49,79 +52,88 @@ nfv5v7 = netflow_v5_v7.c netflow_v5_v7.h
 nfstatfile = nfstatfile.c nfstatfile.h
 nflowcache = nflowcache.c nflowcache.h
 bookkeeper = bookkeeper.c bookkeeper.h
-exporter = exporter.c exporter.h
 expire= expire.c expire.h
 launch = launch.c launch.h
 
+lib_LTLIBRARIES = libnfdump.la
+libnfdump_la_SOURCES = $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
+#libnfdump_la_LIBADD = -lz
+libnfdump_la_LDFLAGS = -release 1.6.14 -shared 
+
+
 nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
-	$(common) $(nflowcache) $(util) $(filelzo) $(nflist) $(filter) $(nfprof) $(exporter)
+	$(nflowcache) $(nfprof)
+nfdump_LDADD = -lnfdump
 
-nfreplay_SOURCES = nfreplay.c \
-	$(common) $(util) $(filelzo) $(nflist) $(filter) $(nfprof) \
-	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) $(exporter)
+nfreplay_SOURCES = nfreplay.c $(nfprof) \
+	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
+nfreplay_LDADD = -lnfdump
 
-nfprofile_SOURCES = nfprofile.c profile.c profile.h \
-	$(common) $(util) $(filelzo) $(nflist) $(filter) $(nfstatfile) $(exporter)
-nfprofile_LDADD = -lrrd
+nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) 
+nfprofile_LDADD = -lnfdump -lrrd
 
 nftrack_SOURCES = ../extra/nftrack/nftrack.c \
 	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
-	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h \
-	$(common) $(util) $(filelzo) $(nflist) $(filter)
+	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h 
 nftrack_CFLAGS = -I ../extra/nftrack
-nftrack_LDADD = -lrrd
+nftrack_LDADD = -lnfdump -lrrd
 
 nfcapd_SOURCES = nfcapd.c \
-	$(common) $(util) $(filelzo) $(nflist) $(nfstatfile) $(launch) \
+	$(nfstatfile) $(launch) \
 	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
+nfcapd_LDADD = -lnfdump 
 
 nfpcapd_SOURCES = nfpcapd.c \
 	$(pcaproc) $(netflow_pcap) \
-	$(common) $(util) $(filelzo) $(nflist) $(nfstatfile) $(launch) \
+	$(nfstatfile) $(launch) \
 	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
+nfpcapd_LDADD = -lnfdump 
 
 if READPCAP
 nfcapd_CFLAGS = -DPCAP
 nfcapd_SOURCES += pcap_reader.c pcap_reader.h
-nfcapd_LDADD = -lpcap 
+nfcapd_LDADD += -lpcap 
 endif
 
 if BUILDNFPCAPD
 bin_PROGRAMS += nfpcapd
 nfpcapd_CFLAGS = -D_BSD_SOURCE
-nfpcapd_LDADD = -lpcap 
+nfpcapd_LDADD += -lpcap 
 nfpcapd_LDFLAGS = -pthread
 endif
 
 sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \
-	$(common) $(util) $(filelzo) $(nflist) $(nfstatfile) $(launch) \
+	$(nfstatfile) $(launch) \
 	$(nfnet) $(collector) $(bookkeeper) $(expire)
+sfcapd_LDADD = -lnfdump 
 
 if READPCAP
 sfcapd_CFLAGS = -DPCAP
 sfcapd_SOURCES += pcap_reader.c pcap_reader.h
-sfcapd_LDADD = -lpcap
+sfcapd_LDADD += -lpcap
 endif
 
-nfreader_SOURCES = nfreader.c \
-	$(util) $(filelzo) $(nflist)  $(exporter)
+nfreader_SOURCES = nfreader.c 
+nfreader_LDADD = -lnfdump 
 
-nfanon_SOURCES = nfanon.c \
-	$(util) $(filelzo) $(nflist) $(anon)
+nfanon_SOURCES = nfanon.c $(anon)
+nfanon_LDADD = -lnfdump 
 
-nfgen_SOURCES = nfgen.c $(util) $(filelzo) $(nflist)
+nfgen_SOURCES = nfgen.c 
+nfgen_LDADD = -lnfdump 
 
 nfexpire_SOURCES = nfexpire.c \
-	$(bookkeeper) $(expire) $(util) $(nfstatfile)
-nfexpire_LDADD = @FTS_OBJ@
+	$(bookkeeper) $(expire) $(nfstatfile)
+nfexpire_LDADD = -lnfdump @FTS_OBJ@
 
-nftest_SOURCES = nftest.c $(common) $(util) $(filter) $(filelzo)
+nftest_SOURCES = nftest.c 
+nftest_LDADD = -lnfdump 
 nftest_DEPENDENCIES = nfgen
 
 if FT2NFDUMP
-ft2nfdump_SOURCES = ft2nfdump.c $(common) $(filelzo) $(util) $(nflist)
+ft2nfdump_SOURCES = ft2nfdump.c 
 ft2nfdump_CFLAGS = @FT_INCLUDES@
-ft2nfdump_LDADD = -lft -lz
+ft2nfdump_LDADD = -lnfdump -lft -lz
 ft2nfdump_LDADD += @FT_LDFLAGS@
 endif
 

bin/netflow_pcap.c

@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <syslog.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
@@ -139,7 +138,7 @@ uint16_t	map_size;
 	// Create a generic pcap extension map
 	pcap_extension_info.map = (extension_map_t *)malloc((size_t)map_size);
 	if ( !pcap_extension_info.map ) {
-		syslog(LOG_ERR, "Process_pcap: malloc() error in %s line %d: %s\n", __FILE__, __LINE__, strerror (errno));
+		LogError("Process_pcap: malloc() error in %s line %d: %s\n", __FILE__, __LINE__, strerror (errno));
 		return 0;
 	}
 	pcap_extension_info.map->type 	  	  	= ExtensionMapType;

bin/nffile.h

@@ -475,6 +475,7 @@ typedef struct ip_addr_s {
 		};
 		uint64_t		_v6[2];
 	} ip_union;
+#define IP_ADDR_T
 } ip_addr_t;
 
 #define v4 ip_union._v4

bin/nfpcapd.c

@@ -1466,7 +1466,6 @@ p_flow_thread_args_t *p_flow_thread_args;
 
 	// Init the extension map list
 	if ( !InitExtensionMapList(fs) ) {
-		// error message goes to syslog
 		pcap_close(pcap_dev->handle);
 		exit(255);
 	}

bin/sflow.c

@@ -915,6 +915,7 @@ static void decodeIPV4(SFSample *sample)
 			dbg_printf("IPFragmentOffset %u\n", sample->ip_fragmentOffset);
 		}
 		else {
+			dbg_printf("Unfragmented\n");
 			/* advance the pointer to the next protocol layer */
 			/* ip headerLen is expressed as a number of quads */
 			ptr += (ip.version_and_headerLen & 0x0f) * 4;
@@ -1031,11 +1032,14 @@ value32_t	*val;
 uint32_t bytes, j, id, ipsize, ip_flags;
 uint64_t _bytes, _packets, _t;	// tmp buffers
 
+	dbg_printf("StoreSflowRecord\n");
+
 	gettimeofday(&now, NULL);
 
-	// ignore fragments
-	if( sample->ip_fragmentOffset > 0 ) 
-		return;
+	if( sample->ip_fragmentOffset > 0 ) {
+		sample->dcd_sport = 0;
+		sample->dcd_dport = 0;
+	}
 
 	bytes = sample->sampledPacketSize;
 	
@@ -1082,6 +1086,7 @@ uint64_t _bytes, _packets, _t;	// tmp buffers
 		return;
 	}
 
+	dbg_printf("Fill Record\n");
 	common_record = (common_record_t *)fs->nffile->buff_ptr;
 
 	common_record->size			  = sflow_output_record_size[ip_flags] + ipsize;

config.h.in

@@ -25,6 +25,9 @@
    */
 #undef HAVE_DIRENT_H
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -235,6 +238,9 @@
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 

configure.ac

@@ -8,6 +8,10 @@ AC_INIT(nfdump, 1.6.14, phaag@users.sourceforge.net)
 #AC_CONFIG_SRCDIR([grammar.y])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([subdir-objects])
+
+LT_INIT
+# AC_ENABLE_SHARED
+# AC_ENABLE_STATIC
  
 # Checks for programs.
 AC_PROG_CC

extra/nfdump.spec

@@ -33,6 +33,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc INSTALL README ToDo BSD-license.txt AUTHORS ChangeLog
+%doc INSTALL READMEmd ToDo BSD-license.txt AUTHORS ChangeLog
 %{prefix}/bin/*
 %{prefix}/share/man/man1/*

man/Makefile.in

@@ -85,6 +85,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -151,6 +153,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -163,11 +166,15 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 FTS_OBJ = @FTS_OBJ@
 FT_INCLUDES = @FT_INCLUDES@
 FT_LDFLAGS = @FT_LDFLAGS@
@@ -177,6 +184,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -184,10 +192,20 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LFLAGS = @LFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -196,7 +214,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
 RRD_LIBS = @RRD_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -207,21 +227,31 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -280,6 +310,12 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
 install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
@@ -399,7 +435,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -451,7 +487,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -467,16 +503,17 @@ uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-man \
 	uninstall-man1
 
 .PRECIOUS: Makefile