diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2009-11-24 11:24:43 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2009-11-24 11:24:43 +0000 |
| commit | eab18481fa7c4790fa435af97a9c487204820ebf (patch) | |
| tree | 8e08f312836efd951be7a6f44b300ddfb129a51a /Makefile | |
| parent | 210421063e374da609a5e00c21d555439cf17b8d (diff) | |
| parent | 1022dc07a5ef997eb40efe8d0ec00cf2621b244f (diff) | |
| download | rabbitmq-server-git-eab18481fa7c4790fa435af97a9c487204820ebf.tar.gz | |
Merge default in. This includes bug22020. There were some
non-obvious conflict resolutions:
- getting rid of the q/x durability agreement check
- in getting rid of the exchange may_auto_deleting, making sure all
branches returned 'ok' (the tests all start failing!).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -51,7 +51,10 @@ $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app $(EBIN_DIR)/gen_server2.beam: $(SOURCE_DIR)/gen_server2.erl erlc $(ERLC_OPTS) $< -$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDE_DIR)/rabbit_framing.hrl $(INCLUDE_DIR)/rabbit.hrl $(EBIN_DIR)/gen_server2.beam +$(EBIN_DIR)/rabbit_exchange_behaviour.beam: $(SOURCE_DIR)/rabbit_exchange_behaviour.erl + erlc $(ERLC_OPTS) $< + +$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDE_DIR)/rabbit_framing.hrl $(INCLUDE_DIR)/rabbit.hrl $(EBIN_DIR)/gen_server2.beam $(EBIN_DIR)/rabbit_exchange_behaviour.beam erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $< # ERLC_EMULATOR="erl -smp" erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $< |