From e25370c54e78fda0a7996b008f7ad68aa80f2ccd Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 7 Sep 2017 20:32:04 +0200 Subject: [PATCH] Automatically configure and compile catta. --- Makefile.am | 4 ++-- README.catta | 5 ----- configure.ac | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 README.catta diff --git a/Makefile.am b/Makefile.am index 762ed7f2..3bf6bdee 100644 --- 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 index 290d53c2..00000000 --- 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 614b10db..8c27a42d 100644 --- 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. -- 2.39.5