diff options
| author | David Wragg <david@rabbitmq.com> | 2010-08-05 14:45:21 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-08-05 14:45:21 +0100 |
| commit | 29288206c95db0ff055eb710492d833a3d44e314 (patch) | |
| tree | 4c8f6669b2e03c71627897fc47640556563aeabd | |
| parent | d749b92411f971b8db8f6a1c2b4e4a01b072619f (diff) | |
| download | rabbitmq-c-29288206c95db0ff055eb710492d833a3d44e314.tar.gz | |
Update for recent changes to rabbitmq-codegen
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | librabbitmq/Makefile.am | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 7217440..ce72632 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,7 @@ AC_ARG_ENABLE(64-bit, 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" -AMQP_EXTENSIONS_JSON_PATH="$AMQP_CODEGEN_DIR/rabbitmq-0.8-extensions.json" +AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-rabbitmq-0.8.json" if test -f "$AMQP_SPEC_JSON_PATH" then @@ -61,13 +60,6 @@ else AC_MSG_ERROR(could not find AMQP spec file at "'$AMQP_SPEC_JSON_PATH'") fi -if test -f "$AMQP_EXTENSIONS_JSON_PATH" -then - AC_MSG_RESULT($AMQP_EXTENSIONS_DIR) -else - AC_MSG_ERROR(could not find extensions spec file at "'$AMQP_EXTENSIONS_JSON_PATH'") -fi - AC_MSG_CHECKING(finding a python with simplejson installed) found_python=no checkPython() { diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am index 203a6fc..35680d0 100644 --- a/librabbitmq/Makefile.am +++ b/librabbitmq/Makefile.am @@ -16,8 +16,8 @@ EXTRA_DIST = \ CODEGEN_PY=$(srcdir)/codegen.py -amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(AMQP_EXTENSIONS_JSON_PATH) $(CODEGEN_PY) - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $(AMQP_EXTENSIONS_JSON_PATH) $@ +amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@ -amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(AMQP_EXTENSIONS_JSON_PATH) $(CODEGEN_PY) - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $(AMQP_EXTENSIONS_JSON_PATH) $@ +amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@ |