FIX: bring autotools build system up to date

Remove the amqp_framing.c/.h regeneration logic as it breaks make dist.
Bring the EXTRA_DIST list up to date with whats in the repo

2 files changed, 61 insertions, 136 deletions

diff --git a/Makefile.am b/Makefile.am
index 1de9b0f..1cd767f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,35 +1,44 @@
 # vim:set ts=2 sw=2 sts=2 noet:
 ACLOCAL_AMFLAGS = -I m4
 
-if REGENERATE_AMQP_FRAMING
-amqp_framing_dir = $(top_builddir)/librabbitmq/gen
-AM_CFLAGS = -I$(amqp_framing_dir) -I$(top_srcdir)/librabbitmq
-else
 AM_CFLAGS = -I$(top_srcdir)/librabbitmq
-endif #REGENERATE_AMQP_FRAMING
-
 
 lib_LTLIBRARIES = librabbitmq/librabbitmq.la
 
+librabbitmq_librabbitmq_la_CFLAGS = \
+	$(SSL_CFLAGS) \
+	$(AM_CFLAGS)
+
+librabbitmq_librabbitmq_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+	$(NO_UNDEFINED) \
+	$(SSL_LIBS)
+
+include_HEADERS = \
+	librabbitmq/amqp.h \
+	librabbitmq/amqp_framing.h \
+	librabbitmq/amqp_tcp_socket.h
+
+if SSL
+include_HEADERS += librabbitmq/amqp_ssl_socket.h
+endif
+
 librabbitmq_librabbitmq_la_SOURCES = \
-	librabbitmq/amqp-socket.h \
-	librabbitmq/amqp_tcp_socket.c \
 	librabbitmq/amqp_api.c \
 	librabbitmq/amqp_connection.c \
+	librabbitmq/amqp_consumer.c \
+	librabbitmq/amqp_framing.c \
 	librabbitmq/amqp_mem.c \
 	librabbitmq/amqp_private.h \
 	librabbitmq/amqp_socket.c \
+	librabbitmq/amqp_socket.h \
 	librabbitmq/amqp_table.c \
-	librabbitmq/amqp_url.c \
-	librabbitmq/amqp_timer.h \
+	librabbitmq/amqp_tcp_socket.c \
+	librabbitmq/amqp_tcp_socket.h \
 	librabbitmq/amqp_timer.c \
-	librabbitmq/amqp_consumer.c
+	librabbitmq/amqp_timer.h \
+	librabbitmq/amqp_url.c
 
-if REGENERATE_AMQP_FRAMING
-librabbitmq_librabbitmq_la_SOURCES += librabbitmq/gen/amqp_framing.c
-else
-librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_framing.c
-endif
 
 if SSL_CYASSL
 librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_cyassl.c
@@ -47,16 +56,6 @@ if SSL_POLARSSL
 librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_polarssl.c
 endif
 
-librabbitmq_librabbitmq_la_CFLAGS = \
-	-I$(top_srcdir)/librabbitmq \
-	$(SSL_CFLAGS) \
-	$(AM_CFLAGS)
-
-librabbitmq_librabbitmq_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	$(NO_UNDEFINED) \
-	$(SSL_LIBS)
-
 if OS_UNIX
 librabbitmq_librabbitmq_la_SOURCES += librabbitmq/unix/threads.h
 librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/unix
@@ -64,62 +63,11 @@ endif
 
 if OS_WIN32
 librabbitmq_librabbitmq_la_SOURCES += librabbitmq/win32/threads.h
-librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/win32
-librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/win32/msinttypes
+librabbitmq_librabbitmq_la_CFLAGS += \
+	-I$(top_srcdir)/librabbitmq/win32 \
+	-I$(top_srcdir)/librabbitmq/win32/msinttypes
 endif
 
-include_HEADERS = \
-	$(top_srcdir)/librabbitmq/amqp.h \
-	$(top_builddir)/librabbitmq/amqp_tcp_socket.h
-
-if SSL
-include_HEADERS += librabbitmq/amqp_ssl_socket.h
-endif
-
-if REGENERATE_AMQP_FRAMING
-
-if PYTHON3
-codegen_py = $(top_builddir)/librabbitmq/python3/codegen3.py
-codegenlib_py = $(top_builddir)/librabbitmq/python3/amqp_codegen.py
-codegenlib_path = $(top_builddir)/librabbitmq/python3
-
-$(codegenlib_path):
-	$(AM_V_at)$(MKDIR_P) $@
-
-$(codegen_py): $(top_srcdir)/librabbitmq/codegen.py $(codegenlib_path)
-	$(AM_V_GEN)$(PYTHON2TO3) $(top_srcdir)/librabbitmq/codegen.py | patch -p0 -o $(codegen_py)
-
-$(codegenlib_py): $(top_srcdir)/codegen/amqp_codegen.py $(codegenlib_path)
-	$(AM_V_GEN)$(PYTHON2TO3) $(top_srcdir)/codegen/amqp_codegen.py | patch -p0 -o $(codegenlib_py)
-else
-codegen_py = $(top_srcdir)/librabbitmq/codegen.py
-codegenlib_py = $(top_srcdir)/codegen/amqp_codegen.py
-codegenlib_path = $(top_srcdir)/codegen
-endif
-
-amqp_codegen_json = $(top_srcdir)/codegen/amqp-rabbitmq-0.9.1.json
-
-amqp_framing_h = $(amqp_framing_dir)/amqp_framing.h
-amqp_framing_c = $(amqp_framing_dir)/amqp_framing.c
-
-$(amqp_framing_dir):
-	$(AM_V_at)$(MKDIR_P) $@
-
-$(amqp_framing_h): $(amqp_codegen_json) $(codegen_py) $(codegenlib_py) $(amqp_framing_dir)
-	$(AM_V_GEN)PYTHONPATH=$(codegenlib_path) $(PYTHON) $(codegen_py) header $< $@
-
-$(amqp_framing_c): $(amqp_codegen_json) $(codegen_py) $(codegenlib_py) $(amqp_framing_dir)
-	$(AM_V_GEN)PYTHONPATH=$(codegenlib_path) $(PYTHON) $(codegen_py) body $< $@
-
-BUILT_SOURCES = \
-	$(amqp_framing_h) \
-	$(amqp_framing_c)
-
-include_HEADERS += $(amqp_framing_h)
-
-else
-include_HEADERS += $(top_srcdir)/librabbitmq/amqp_framing.h
-endif #REGENERATE_AMQP_FRAMING
 
 check_PROGRAMS = \
 	tests/test_tables \
@@ -287,18 +235,21 @@ tools_libcommon_la_CFLAGS = \
 tools_platform_CFLAGS = $(AM_CFLAGS)
 
 if OS_UNIX
-tools_libcommon_la_SOURCES += tools/unix/process.c
-tools_libcommon_la_SOURCES += tools/unix/process.h
+tools_libcommon_la_SOURCES += \
+	tools/unix/process.c \
+	tools/unix/process.h
 tools_platform_CFLAGS += -I$(top_srcdir)/tools/unix
 endif
 
 if OS_WIN32
-tools_libcommon_la_SOURCES += tools/win32/compat.c
-tools_libcommon_la_SOURCES += tools/win32/compat.h
-tools_libcommon_la_SOURCES += tools/win32/process.c
-tools_libcommon_la_SOURCES += tools/win32/process.h
-tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32
-tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32/msinttypes
+tools_libcommon_la_SOURCES += \
+	tools/win32/compat.c \
+	tools/win32/compat.h \
+	tools/win32/process.c \
+	tools/win32/process.h
+tools_platform_CFLAGS += \
+	-I$(top_srcdir)/tools/win32 \
+	-I$(top_srcdir)/tools/win32/msinttypes
 endif
 
 bin_PROGRAMS = \
@@ -392,37 +343,40 @@ endif # DOCS
 endif # TOOLS
 
 EXTRA_DIST = \
-	$(man_MANS) \
+	AUTHORS \
+	CMakeLists.txt \
+	CONTRIBUTING.md \
+	ChangeLog.md \
 	LICENSE-MIT \
-	codegen/LICENSE \
-	codegen/LICENSE-MPL-RabbitMQ \
-	codegen/Makefile \
-	codegen/README.extensions.md \
-	codegen/amqp-rabbitmq-0.8.json \
-	codegen/amqp-rabbitmq-0.9.1.json \
-	codegen/amqp_codegen.py \
-	codegen/demo_extension.json \
-	codegen/license_info \
-	debian \
+	README-win32.md \
+	README.md \
+	README.vms \
+	THANKS \
+	TODO \
+	cmake \
+	codegen \
+	descrip.mms \
+	docs \
+	examples/CMakeLists.txt \
+	examples/descrip.mms \
+	librabbitmq/CMakeLists.txt \
 	librabbitmq/codegen.py \
+	librabbitmq/descrip.mms \
+	tests/CMakeLists.txt \
 	tests/test_tables.expected \
+	tools/CMakeLists.txt \
 	tools/doc/amqp-consume.xml \
 	tools/doc/amqp-declare-queue.xml \
 	tools/doc/amqp-delete-queue.xml \
 	tools/doc/amqp-get.xml \
 	tools/doc/amqp-publish.xml \
-	tools/doc/librabbitmq-tools.xml
+	tools/doc/librabbitmq-tools.xml \
+	vms
 
 MOSTLYCLEANFILES = \
 	$(man_MANS) \
 	$(top_builddir)/tools/doc/man-date.ent
 
-if REGENERATE_AMQP_FRAMING
-MOSTLYCLEANFILES += \
-	$(amqp_framing_h) \
-	$(amqp_framing_c)
-endif #REGENERATE_AMQP_FRAMING
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = librabbitmq.pc
 
diff --git a/configure.ac b/configure.ac
index c92af48..71cb21c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ m4_define([soversion_revision],  [1])
 m4_define([soversion_age],       [0])
 
 AC_INIT([rabbitmq-c], [major_version.minor_version.micro_version],
-	[https://github.com/alanxz/rabbitmq-c/issues], [librabbitmq],
+	[https://github.com/alanxz/rabbitmq-c/issues], [rabbitmq-c],
 	[http://www.rabbitmq.com/])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 subdir-objects foreign -Wno-portability])
@@ -101,35 +101,6 @@ AC_SEARCH_LIBS([socket], [socket], [],
 AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_CHECK_FUNCS([htonll])
 
-AC_ARG_ENABLE([regen-amqp-framing],
-              [AS_HELP_STRING([--enable-regen-amqp-framing],
-                              [Regenerate amqp_framing.h/amqp_framing.c (for developer use)])])
-
-AM_CONDITIONAL([REGENERATE_AMQP_FRAMING], [test "x$enable_regen_amqp_framing" = "xyes"])
-
-AS_IF([test "x$enable_regen_amqp_framing" = "xyes"],
-      [AM_PATH_PYTHON([2.4],,AC_MSG_ERROR([--enable-regen-amqp-framing requires python]))
-
-       AX_PYTHON_MODULE([json], [])
-       AS_IF([test "x$HAVE_PYMOD_JSON" = "xno"],
-             [AX_PYTHON_MODULE([simplejson])])
-       AS_IF([test "x$HAVE_PYMOD_JSON" = "xno" && test "x$HAVE_PYMOD_SIMPLEJSON" = "xno"],
-             [AC_MSG_ERROR([Unable to find json or simplejson python modules])])
-
-       AS_VERSION_COMPARE([$PYTHON_VERSION],[3.0],
-                          [eval HAVE_PYTHON3=no],
-                          [eval HAVE_PYTHON3=yes],
-                          [eval HAVE_PYTHON3=yes])
-
-       AS_IF([test "x$HAVE_PYTHON3" = "xyes"],
-             [AC_PATH_PROG(PYTHON2TO3,[2to3])
-              AS_IF([test "x$PYTHON2TO3" = "x"],
-              AC_MSG_ERROR([Unable to find 2to3 python utility]))])
-
-       ],
-       [HAVE_PYTHON3=no])
-AM_CONDITIONAL([PYTHON3], [test "x$HAVE_PYTHON3" = "xyes"])
-
 # Configure SSL/TLS
 AC_ARG_WITH([ssl],
 	    [AS_HELP_STRING([--with-ssl=@<:@cyassl/gnutls/no/openssl/polarssl/yes@:>@],