aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-08-08 13:26:45 +0200
committerBjörn Gustavsson <[email protected]>2011-08-08 13:26:45 +0200
commitd95f24d2d3921461fc1c57f15fbaee7a4f149df4 (patch)
tree93e8654badbe1812bd489b56f3ad184586045dc8 /lib/diameter
parent302b2a1bf0194ca81c7731699b75e4800f718955 (diff)
parent542edfc2e267ba50cc948bb525d945244cf931f9 (diff)
downloadotp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.gz
otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.bz2
otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.zip
Merge branch 'bjorn/parallel-make/OTP-9451' into major
* bjorn/parallel-make/OTP-9451: (28 commits) erl_interface: Support parallel make dialyzer: Remove special-case build in the top Makefile pcre: Rename Makefile.in to pcre.mk and include it cos*/src/Makefile: Support parallel make ic: Support parallel make orber: Support parallel make .gitignore: Ignore IDL-GENERATED public_key: Support parallel make ssh: Support parallel make os_mon: Support parallel make diameter: Support parallel make snmp: Support parallel make megaco: Support parallel make megaco/src/flex/Makefile.in: Support parallel make */c_src/Makefile*: Support parallel make eunit: Support parallel make gs: Support parallel make common_test Makefile: Support parallel make erts/emulator/Makefile.in: Support parallel make erts: Fix dependency generation ...
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/app/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile
index 6de220d282..31344fa80b 100644
--- a/lib/diameter/src/app/Makefile
+++ b/lib/diameter/src/app/Makefile
@@ -52,6 +52,14 @@ INCDIR = ../../include
include modules.mk
+diameter_gen_base_accounting.erl: \
+ $(EBIN)/diameter_gen_base_rfc3588.beam
+diameter_gen_relay.erl: \
+ $(EBIN)/diameter_gen_base_rfc3588.beam
+
+SPEC_MODULES = \
+ $(SPEC_FILES:%.dia=%)
+
SPEC_ERL_FILES = \
$(SPEC_FILES:%.dia=%.erl)
@@ -60,7 +68,7 @@ SPEC_HRL_FILES = \
APP_MODULES = \
$(MODULES) \
- $(SPEC_FILES:%.dia=%)
+ $(SPEC_MODULES)
TARGET_FILES = \
$(APP_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
@@ -150,6 +158,7 @@ app: $(APP_TARGET) $(APPUP_TARGET)
diameter_gen_%.erl diameter_gen_%.hrl: diameter_gen_%.dia
../../bin/diameterc -i $(EBIN) -o $(@D) $<
+$(SPEC_MODULES:%=$(EBIN)/%.$(EMULATOR)): $(EBIN)/diameter_exprecs.$(EMULATOR)
# ----------------------------------------------------
# Release Target