diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-07-14 13:40:33 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-07-14 13:40:33 +0100 |
| commit | 3cf69f1362e3824ec44772971cfe6d04129dc80e (patch) | |
| tree | 25c2ca772a70eb97497f65fad84052483cd2044e | |
| parent | 7fec8ff4815c896997f0a476b282c7bac3ede7ad (diff) | |
| download | rabbitmq-c-github-ask-3cf69f1362e3824ec44772971cfe6d04129dc80e.tar.gz | |
Make "make distcheck" work and pass
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | examples/Makefile.am | 6 | ||||
| -rw-r--r-- | librabbitmq/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
5 files changed, 31 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 8f774b5..3153ad9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,3 +5,11 @@ squeakyclean: maintainer-clean rm -f aclocal.m4 rm -f config.guess config.h.in* config.sub configure rm -f depcomp install-sh ltmain.sh missing + rm -rf codegen + +codegen: + mkdir -p $@ + cp -r "@AMQP_CODEGEN_DIR@"/* $@ + $(MAKE) -C $@ clean + +EXTRA_DIST=codegen debian LICENSE-MPL-RabbitMQ diff --git a/configure.ac b/configure.ac index 9939973..5e22cca 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,16 @@ if test "x$GCC" = "xyes"; then fi fi -sibling_codegen_dir=$(pwd)/../rabbitmq-codegen -AMQP_CODEGEN_DIR=$(test -d $sibling_codegen_dir && echo $sibling_codegen_dir || echo codegen) -AMQP_SPEC_JSON_PATH=$AMQP_CODEGEN_DIR/amqp-0.8.json +AC_MSG_CHECKING(location of AMQP codegen directory) +sibling_codegen_dir="$ac_abs_confdir/../rabbitmq-codegen" +AMQP_CODEGEN_DIR=$(test -d "$sibling_codegen_dir" && echo "$sibling_codegen_dir" || echo "$ac_abs_confdir/codegen") +AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-0.8.json" +if test -f "$AMQP_SPEC_JSON_PATH" +then + AC_MSG_RESULT($AMQP_CODEGEN_DIR) +else + AC_MSG_ERROR(could not find AMQP spec file at "'$AMQP_SPEC_JSON_PATH'") +fi AC_SUBST(AMQP_CODEGEN_DIR) AC_SUBST(AMQP_SPEC_JSON_PATH) diff --git a/examples/Makefile.am b/examples/Makefile.am index 39c8fab..6ac915a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,10 +1,10 @@ bin_PROGRAMS = amqp_sendstring amqp_exchange_declare amqp_listen amqp_producer amqp_consumer \ amqp_unbind amqp_bind -AM_CFLAGS = -I../librabbitmq -AM_LDFLAGS = ../librabbitmq/librabbitmq.la +AM_CFLAGS = -I$(top_srcdir)/librabbitmq +AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la -nodist_INCLUDES = example_utils.h +noinst_HEADERS = example_utils.h amqp_sendstring_SOURCES = amqp_sendstring.c example_utils.c amqp_exchange_declare_SOURCES = amqp_exchange_declare.c example_utils.c diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am index 44b9d78..12dbd25 100644 --- a/librabbitmq/Makefile.am +++ b/librabbitmq/Makefile.am @@ -3,14 +3,17 @@ lib_LTLIBRARIES = librabbitmq.la librabbitmq_la_SOURCES = amqp_mem.c amqp_table.c amqp_connection.c amqp_socket.c amqp_debug.c amqp_api.c nodist_librabbitmq_la_SOURCES = amqp_framing.c include_HEADERS = amqp_framing.h amqp.h -noinst_librabbitmq_la_INCLUDES = amqp_private.h +noinst_HEADERS = amqp_private.h BUILT_SOURCES = amqp_framing.h amqp_framing.c CLEANFILES = amqp_framing.h amqp_framing.c +EXTRA_DIST = codegen.py PYTHON = python2.5 -amqp_framing.h: $(AMQP_SPEC_JSON_PATH) codegen.py - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py header $< $@ +CODEGEN_PY=$(srcdir)/codegen.py -amqp_framing.c: $(AMQP_SPEC_JSON_PATH) codegen.py - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py body $< $@ +amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@ + +amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@ diff --git a/tests/Makefile.am b/tests/Makefile.am index dafdba4..1ac6faf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ noinst_PROGRAMS = test_tables -AM_CFLAGS = -I../librabbitmq -AM_LDFLAGS = ../librabbitmq/librabbitmq.la +AM_CFLAGS = -I$(top_srcdir)/librabbitmq +AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la |