aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-04-27 19:13:15 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-04-27 19:13:15 +0200
commit57dffc2e9adffd5834a18f837b7d06edf8de8e92 (patch)
treebba3769ccaef5b763d2c68ea915cc569ee25f634 /lib/inets
parentf73c09acbb61425e26093c44889ebce3582c0280 (diff)
parent806798d6beda18ddec29b7f4ed09b3ea6d75c532 (diff)
downloadotp-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/inets')
-rw-r--r--lib/inets/src/tftp/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
index 759b70c8e4..f728543adb 100644
--- a/lib/inets/src/tftp/Makefile
+++ b/lib/inets/src/tftp/Makefile
@@ -39,8 +39,10 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
# ----------------------------------------------------
# Target Specs
# ----------------------------------------------------
+BEHAVIOUR_MODULES= \
+ tftp
+
MODULES = \
- tftp \
tftp_binary \
tftp_engine \
tftp_file \
@@ -50,10 +52,13 @@ MODULES = \
HRL_FILES = tftp.hrl
-ERL_FILES = $(MODULES:%=%.erl)
+ERL_FILES= \
+ $(MODULES:%=%.erl) \
+ $(BEHAVIOUR_MODULES:%=%.erl)
TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
# ----------------------------------------------------
# FLAGS
@@ -72,10 +77,12 @@ ERL_COMPILE_FLAGS += \
# Targets
# ----------------------------------------------------
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
debug opt: $(TARGET_FILES)
clean:
- rm -f $(TARGET_FILES)
+ rm -f $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES)
rm -f core
docs:
@@ -90,7 +97,7 @@ release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src/tftp
$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
$(INSTALL_DIR) $(RELSYSDIR)/ebin
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) $(RELSYSDIR)/ebin
release_docs_spec: