Add contrib dir and it's content to the dist. Bug 567

diff --git a/Makefile.am b/Makefile.am
index 5fe46432d8b66c478c39b4f46abe4f2faa7476a7..62e8488510289e7c61b95cfbce8a8b1980905555 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \
 if BUILD_LIBHTP
  HTP_DIR = libhtp
 endif
-SUBDIRS = $(HTP_DIR) src qa rules doc
+SUBDIRS = $(HTP_DIR) src qa rules doc contrib
 
 install-data-am:
        @echo "Run 'make install-conf' if you want to install initial configuration files. Or 'make install-full' to install configuration and rules";

diff --git a/configure.ac b/configure.ac
index ecdc00ab21397bb6601ff11192a483963958677a..6917ccab5136ba423dbf02aff16aae38becf6204 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_INIT(configure.ac)
 
     AM_CONFIG_HEADER(config.h)
-    AM_INIT_AUTOMAKE(suricata, 1.4dev)
+    AM_INIT_AUTOMAKE(suricata, 1.4beta3)
 
     AC_LANG_C
     AC_PROG_CC_C99
@@ -1359,7 +1359,7 @@ AC_SUBST(e_sysconfrulesdir)
 AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR])
 AC_SUBST(e_magic_file)
 
-AC_OUTPUT(Makefile src/Makefile qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile suricata.yaml)
+AC_OUTPUT(Makefile src/Makefile qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile suricata.yaml)
 
 echo "
 Suricata Configuration:

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644 (file)
index 0000000..2fe815a
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = file_processor

diff --git a/contrib/file_processor/Action/Makefile.am b/contrib/file_processor/Action/Makefile.am
new file mode 100644 (file)
index 0000000..ddf7321
--- /dev/null
+++ b/contrib/file_processor/Action/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST=Log.pm Syslog.pm

diff --git a/contrib/file_processor/Makefile.am b/contrib/file_processor/Makefile.am
new file mode 100644 (file)
index 0000000..925c174
--- /dev/null
+++ b/contrib/file_processor/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = Action Processor
+EXTRA_DIST = file_processor.conf  file_processor.pl LICENSE README

diff --git a/contrib/file_processor/Processor/Makefile.am b/contrib/file_processor/Processor/Makefile.am
new file mode 100644 (file)
index 0000000..a9a2fef
--- /dev/null
+++ b/contrib/file_processor/Processor/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST=Anubis.pm  Malwr.pm  ShadowServer.pm  ThreatExpert.pm  VirusTotal.pm
+