aboutsummaryrefslogtreecommitdiffstats
path: root/lib/eunit/src
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/eunit/src
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/eunit/src')
-rw-r--r--lib/eunit/src/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index bec2fdbe0b..0b6ed1e839 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -28,6 +28,9 @@ ERL_COMPILE_FLAGS += -pa $(EBIN) -I$(INCLUDE) +warn_unused_vars +nowarn_shadow_v
PARSE_TRANSFORM = eunit_autoexport.erl
+BEHAVIOUR_SOURCES= \
+ eunit_listener.erl
+
SOURCES= \
eunit_striptests.erl \
eunit.erl \
@@ -40,13 +43,16 @@ SOURCES= \
eunit_data.erl \
eunit_tty.erl \
eunit_surefire.erl \
- eunit_listener.erl
INCLUDE_FILES = eunit.hrl
PARSE_TRANSFORM_BIN = $(PARSE_TRANSFORM:%.erl=$(EBIN)/%.$(EMULATOR))
-OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+TARGET_FILES= $(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
+
+OBJECTS= $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
INCLUDE_DELIVERABLES = $(INCLUDE_FILES:%=$(INCLUDE)/%)
@@ -62,6 +68,8 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
# Targets
# ----------------------------------------------------
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
debug opt: $(PARSE_TRANSFORM_BIN) $(OBJECTS)
docs: