Convert to non-recursive Automake

This change should speed up parallel builds considerably. It also
simplifies the structure of the build system making it possible to
properly track dependencies.

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>

7 files changed, 0 insertions, 73 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 6fa1e4b..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-SUBDIRS=doc
-
-bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue
-
-# The -I to srcdir's librabbitmq is for the main amqp header
-# files. The -I to builddir's librabbitmq is less obvious; it's for
-# VPATH-based builds: the amqp_framing.h gets generated into the
-# *build* directory, not the source directory.
-AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(srcdir)/$(PLATFORM_DIR) -I$(top_builddir)/librabbitmq
-AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
-
-LDADD=$(LIBPOPT)
-
-noinst_HEADERS = common.h $(PLATFORM_DIR)/process.h
-
-COMMON_SOURCES = common.c
-
-if WINDOWS
-COMMON_SOURCES += windows/compat.c
-endif
-
-amqp_publish_SOURCES = publish.c $(COMMON_SOURCES)
-amqp_get_SOURCES = get.c $(COMMON_SOURCES)
-amqp_consume_SOURCES = consume.c $(PLATFORM_DIR)/process.c $(COMMON_SOURCES)
-amqp_declare_queue_SOURCES = declare_queue.c $(COMMON_SOURCES)
-amqp_delete_queue_SOURCES = delete_queue.c $(COMMON_SOURCES)
-
-EXTRA_DIST = \
-	unix/process.c unix/process.h \
-	windows/process.c windows/process.h \
-	windows/compat.c windows/compat.h
diff --git a/tools/doc/Makefile.am b/tools/doc/Makefile.am
deleted file mode 100644
index f482d94..0000000
--- a/tools/doc/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-EXTRA_DIST = \
-	publish.xml \
-	consume.xml \
-	get.xml \
-	declare_queue.xml \
-	delete_queue.xml \
-	librabbitmq-tools.xml
-
-if TOOLS_DOC
-man_MANS = \
-	amqp-publish.1 \
-	amqp-consume.1 \
-	amqp-get.1 \
-	amqp-declare-queue.1 \
-	amqp-delete-queue.1 \
-	librabbitmq-tools.7
-MOSTLYCLEANFILES = man-date.ent $(man_MANS)
-
-# automake complains about % pattern rules, and suffix rules don't
-# support multiple dependencies, so we have to expand all these out.
-#
-# Also, xmlto's --searchpath doesn't get passed through to xmllint, so
-# we disable xmllint validation with --skip-validation for the benefit
-# of build/source separation as required by distcheck, debian
-# packaging etc.
-amqp-publish.1: publish.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-amqp-consume.1: consume.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-amqp-get.1: get.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-amqp-declare-queue.1: declare_queue.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-amqp-delete-queue.1: delete_queue.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-librabbitmq-tools.7: librabbitmq-tools.xml man-date.ent
-	$(XMLTO) --skip-validation --searchpath $(CURDIR) man $<
-
-man-date.ent:
-	date +'%Y-%m-%d' >$@
-
-endif
diff --git a/tools/doc/consume.xml b/tools/doc/amqp-consume.xml
index b5f40d7..b5f40d7 100644
--- a/tools/doc/consume.xml
+++ b/tools/doc/amqp-consume.xml
diff --git a/tools/doc/declare_queue.xml b/tools/doc/amqp-declare-queue.xml
index 0fc0440..0fc0440 100644
--- a/tools/doc/declare_queue.xml
+++ b/tools/doc/amqp-declare-queue.xml
diff --git a/tools/doc/delete_queue.xml b/tools/doc/amqp-delete-queue.xml
index 040a384..040a384 100644
--- a/tools/doc/delete_queue.xml
+++ b/tools/doc/amqp-delete-queue.xml
diff --git a/tools/doc/get.xml b/tools/doc/amqp-get.xml
index 08abe2b..08abe2b 100644
--- a/tools/doc/get.xml
+++ b/tools/doc/amqp-get.xml
diff --git a/tools/doc/publish.xml b/tools/doc/amqp-publish.xml
index e609972..e609972 100644
--- a/tools/doc/publish.xml
+++ b/tools/doc/amqp-publish.xml