diff options
| author | Anders Svensson <[email protected]> | 2011-09-27 20:20:43 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-09-27 20:20:43 +0200 |
| commit | 58fe7b5e48ad95f14b05aae43a3a32122695da4e (patch) | |
| tree | d4dbc0838f6053fd6ff9cc66c52f6a1b0fd5e36f /lib/diameter/src/app/Makefile | |
| parent | 5d61dc1014b17e417ddc13e220283745460af70c (diff) | |
| parent | 0296dbb27b20c75edc6a2dd75369dc17dc98aa5a (diff) | |
| download | otp-58fe7b5e48ad95f14b05aae43a3a32122695da4e.tar.gz otp-58fe7b5e48ad95f14b05aae43a3a32122695da4e.tar.bz2 otp-58fe7b5e48ad95f14b05aae43a3a32122695da4e.zip | |
Merge branch 'anders/diameter/release-0.10' into dev
* anders/diameter/release-0.10:
Example/dbg/comment fixes
Don't include compiler/help modules in app
Set version to 0.10 and update appup
Diffstat (limited to 'lib/diameter/src/app/Makefile')
| -rw-r--r-- | lib/diameter/src/app/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile index 229466e264..ab5754f74f 100644 --- a/lib/diameter/src/app/Makefile +++ b/lib/diameter/src/app/Makefile @@ -58,12 +58,20 @@ SPEC_ERL_FILES = \ SPEC_HRL_FILES = \ $(SPEC_FILES:%.dia=%.hrl) +MODULES = \ + $(RUNTIME_MODULES) \ + $(HELP_MODULES) + APP_MODULES = \ - $(MODULES) \ + $(RUNTIME_MODULES) \ $(SPEC_FILES:%.dia=%) +TARGET_MODULES = \ + $(APP_MODULES) \ + $(HELP_MODULES) + TARGET_FILES = \ - $(APP_MODULES:%=$(EBIN)/%.$(EMULATOR)) \ + $(TARGET_MODULES:%=$(EBIN)/%.$(EMULATOR)) \ $(APP_TARGET) \ $(APPUP_TARGET) @@ -125,17 +133,15 @@ info: # ---------------------------------------------------- # Generate the app file and then modules into in. This shouldn't know -# about ../{compiler,transport} but good enough for now. +# about ../transport but good enough for now. $(APP_TARGET): $(APP_SRC) \ ../../vsn.mk \ modules.mk \ - ../compiler/modules.mk \ ../transport/modules.mk sed -e 's;%VSN%;$(VSN);' $< > $@ M=`echo $(APP_MODULES) | sed -e 's/^ *//' -e 's/ *$$//' -e 'y/ /,/'`; \ echo "/%APP_MODULES%/s//$$M/;w;q" | tr ';' '\n' \ | ed -s $@ - $(MAKE) -C ../compiler $(APP_TARGET) APP_TARGET=$(APP_TARGET) $(MAKE) -C ../transport $(APP_TARGET) APP_TARGET=$(APP_TARGET) $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk @@ -150,7 +156,6 @@ app: $(APP_TARGET) $(APPUP_TARGET) diameter_gen_%.erl diameter_gen_%.hrl: diameter_gen_%.dia ../../bin/diameterc -i $(EBIN) -o $(@D) $< - # ---------------------------------------------------- # Release Target # ---------------------------------------------------- |