diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:15 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-27 19:13:15 +0200 |
| commit | 57dffc2e9adffd5834a18f837b7d06edf8de8e92 (patch) | |
| tree | bba3769ccaef5b763d2c68ea915cc569ee25f634 /lib/megaco | |
| parent | f73c09acbb61425e26093c44889ebce3582c0280 (diff) | |
| parent | 806798d6beda18ddec29b7f4ed09b3ea6d75c532 (diff) | |
| download | otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.tar.gz otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.tar.bz2 otp-57dffc2e9adffd5834a18f837b7d06edf8de8e92.zip | |
Merge branch 'egil/fix-compiler-warnings' into maint
* egil/fix-compiler-warnings:
erl_docgen: Do not overflow images for pdf doc gen
kernel: Fix missing documentation link anchors
megaco: Fix parallel make for behaviours
inets: Fix parallel make for behaviours
ssh: Fix parallel make for behaviours
eunit: Fix parallel make for behaviours
ssl: Fix parallel make for behaviours
wx: configure.in needs AC_LANG_SOURCE
gs: Suppress ignored result warning
erts: Remove unused variable
Diffstat (limited to 'lib/megaco')
| -rw-r--r-- | lib/megaco/src/engine/Makefile | 17 | ||||
| -rw-r--r-- | lib/megaco/src/engine/modules.mk | 1 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile index 3943f4b957..c6a8bc86c7 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile @@ -42,9 +42,14 @@ RELSYSDIR = $(RELEASE_PATH)/lib/megaco-$(VSN) include modules.mk -ERL_FILES = $(MODULES:%=%.erl) +ERL_FILES = \ + $(MODULES:%=%.erl) \ + $(BEHAVIOUR_MODULES:%=%.erl) -TARGET_FILES = \ +BEHAVIOUR_TARGET_FILES= \ + $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR)) + +TARGET_FILES = \ $(MODULES:%=$(EBIN)/%.$(EMULATOR)) @@ -65,19 +70,23 @@ ERL_COMPILE_FLAGS += \ # ---------------------------------------------------- # Targets # ---------------------------------------------------- + +$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) + debug: @${MAKE} TYPE=debug opt opt: $(TARGET_FILES) clean: - rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) + rm -f $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) rm -f errs core *~ docs: info: @echo "MODULES = $(MODULES)" + @echo "BEHAVIOUR_MODULES = $(BEHAVIOUR_MODULES)" @echo "" @@ -89,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/engine $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk index 4bc57cd63e..6e2f9246f0 100644 --- a/lib/megaco/src/engine/modules.mk +++ b/lib/megaco/src/engine/modules.mk @@ -23,7 +23,6 @@ BEHAVIOUR_MODULES = \ megaco_transport MODULES = \ - $(BEHAVIOUR_MODULES) \ megaco_config_misc \ megaco_config \ megaco_digit_map \ |