Automatically configure and compile catta.

diff --git a/Makefile.am b/Makefile.am
index 762ed7f20e13f000a97f54e800f816ca7484f0c5..3bf6bdee8f72580cc66d55bfde4e635eb9aef843 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,11 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc test examples
+SUBDIRS =  m4 catta src doc test examples
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = COPYING.README README.android
+EXTRA_DIST = README.android
 
 ChangeLog:
        git log > ChangeLog

diff --git a/README.catta b/README.catta
deleted file mode 100644 (file)
index 290d53c..0000000
--- a/README.catta
+++ /dev/null
@@ -1,5 +0,0 @@
-
-cd catta
-autoreconf
-./configure CFLAGS=-fPIC
-make

diff --git a/configure.ac b/configure.ac
index 614b10db9459543e8468294df907cda96ac3f829..8c27a42dd4e241a051d217554b926312ae0ec68f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([MeshLink], [0.1])
 AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SUBDIRS([catta])
 AM_SILENT_RULES([yes])
 
 # Enable GNU extensions.