diff options
| author | Micael Karlberg <[email protected]> | 2012-08-17 11:26:48 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-08-17 11:26:48 +0200 |
| commit | 28075f98b7f4faaae93fd6353e1cb34386d22e18 (patch) | |
| tree | 74545b0b74b299a148142a94e3a5595788c5a7ea /lib/inets/src/inets_app/inets.mk | |
| parent | 68e0078eb58803dc4a7e0bfd801f32c2c92b7f26 (diff) | |
| parent | c5578ac8a95de1193bc6d0c7d2e579eba1c197e2 (diff) | |
| download | otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.tar.gz otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.tar.bz2 otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.zip | |
Merge branch 'bmk/inets/inets591_integration' into maint
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)}' |