remove include and rb dirs, to simplify stuff

10 files changed, 41 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index a5aaa42..0e36500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ tests.trs
 www/downloads.html
 www/manuals
 www/out
+*.la
+*.lo
diff --git a/Makefile.am b/Makefile.am
index 42d1236..611684d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,42 @@
 ACLOCAL_AMFLAGS=-I m4
 
-SUBDIRS = include rb man www
+# building librb library
+
+include_HEADERS = rb.h
+
+lib_LTLIBRARIES = librb.la
+librb_la_SOURCES = rb.c valid.h
+librb_la_LDFLAGS = -version-info 1:0:0
+librb_la_CFLAGS = -I$(top_srcdir)
+
+# building test suite
+
+check_PROGRAMS = tests
+tests_SOURCES = rb.c tests.c mtest.h
+tests_CFLAGS = -I$(top_srcdir)
+
+TESTS = $(check_PROGRAMS)
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/tap-driver.sh
+
+# static code analyzer
+
+if ENABLE_ANALYZER
+
+analyze_plists = rb.plist
+MOSTLYCLEANFILES = $(analyze_plists)
+
+$(analyze_plists): %.plist: %.c
+	@echo "  CCSA  " $@
+	@clang --analyze -I$(top_srcdir) -DHAVE_CONFIG_H $< -o $@
+
+analyze: $(analyze_plists)
+
+endif
+
+# building website and manuals
+
+SUBDIRS = man www
 EXTRA_DIST = gen-download-page.sh man2html.sh readme.md tap-driver.sh
 
 www:
@@ -8,7 +44,4 @@ www:
 	./man2html.sh
 	make www -C www
 
-analyze:
-	make analyze -C rb
-
-.PHONY: www
+.PHONY: www analyze tests librb.la
diff --git a/configure.ac b/configure.ac
index 6ea3666..229ee96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AM_INIT_AUTOMAKE([foreign])
 AC_PROG_CC
 AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_FILES([Makefile rb/Makefile include/Makefile man/Makefile www/Makefile])
+AC_CONFIG_FILES([Makefile man/Makefile www/Makefile])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 43763d3..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-include_HEADERS = rb.h
diff --git a/rb/mtest.h b/mtest.h
index 8f177d2..8f177d2 100644
--- a/rb/mtest.h
+++ b/mtest.h
diff --git a/rb/rb.c b/rb.c
index 6d78446..6d78446 100644
--- a/rb/rb.c
+++ b/rb.c
diff --git a/include/rb.h b/rb.h
index da7d036..da7d036 100644
--- a/include/rb.h
+++ b/rb.h
diff --git a/rb/Makefile.am b/rb/Makefile.am
deleted file mode 100644
index c48d14e..0000000
--- a/rb/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-lib_LTLIBRARIES = librb.la
-librb_la_SOURCES = rb.c valid.h
-librb_la_LDFLAGS = -version-info 1:0:0
-librb_la_CFLAGS = -I$(top_srcdir)/include
-
-check_PROGRAMS = tests
-tests_SOURCES = rb.c tests.c mtest.h
-tests_CFLAGS = -I$(top_srcdir)/include
-
-TESTS = $(check_PROGRAMS)
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/tap-driver.sh
-
-# static code analyzer
-
-if ENABLE_ANALYZER
-
-analyze_plists = rb.plist
-MOSTLYCLEANFILES = $(analyze_plists)
-
-$(analyze_plists): %.plist: %.c
-	@echo "  CCSA  " $@
-	@clang --analyze -I.. $< -o $@
-
-analyze: $(analyze_plists)
-
-endif
diff --git a/rb/tests.c b/tests.c
index f2da020..f2da020 100644
--- a/rb/tests.c
+++ b/tests.c
diff --git a/rb/valid.h b/valid.h
index c753443..c753443 100644
--- a/rb/valid.h
+++ b/valid.h