diff options
| author | Micael Karlberg <[email protected]> | 2012-07-11 11:25:19 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-07-11 11:25:19 +0200 |
| commit | 57958e49b0fe80e1fe96bab6fd0d2da196ac5584 (patch) | |
| tree | ed13be75a8c4e29f1a93f7a5ebafb913fcf5ac90 /lib/inets/src/inets_app/inets.mk | |
| parent | d020e23b70ac9b850488cf4f0791b435876ba365 (diff) | |
| parent | 6549340d9920df8f8c29223fe1853a37e30f0a41 (diff) | |
| download | otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.tar.gz otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.tar.bz2 otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.zip | |
Merge branch 'bmk/inets/otp_version_dependent_behaviour_def/OTP-10095' into bmk/inets/inets591_integration
Diffstat (limited to 'lib/inets/src/inets_app/inets.mk')
| -rw-r--r-- | lib/inets/src/inets_app/inets.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk index d24cc0aea3..adef32dc19 100644 --- a/lib/inets/src/inets_app/inets.mk +++ b/lib/inets/src/inets_app/inets.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2011. All Rights Reserved. +# Copyright Ericsson AB 2010-2012. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -33,10 +33,6 @@ ifeq ($(WARN_UNUSED_WARS), true) ERL_COMPILE_FLAGS += +warn_unused_vars endif -ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B) -INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER' -endif - INETS_APP_VSN_COMPILE_FLAGS = \ +'{parse_transform,sys_pre_attributes}' \ +'{attribute,insert,app_vsn,$(APP_VSN)}' |