diff options
| author | Dan Gudmundsson <[email protected]> | 2011-05-20 09:00:55 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-05-20 09:00:55 +0200 |
| commit | b73a5dece4f5baafe2ab3c0630c2e8986746f245 (patch) | |
| tree | e9f3bae6e8573cb2ed7a165107028f06a3d62677 | |
| parent | 69d71bef9ce00c0982fc2a92adcad40b3968e166 (diff) | |
| parent | 86e7b7cac4bd15acfc04fb2ba17acab87fbfb51f (diff) | |
| download | otp-b73a5dece4f5baafe2ab3c0630c2e8986746f245.tar.gz otp-b73a5dece4f5baafe2ab3c0630c2e8986746f245.tar.bz2 otp-b73a5dece4f5baafe2ab3c0630c2e8986746f245.zip | |
Merge branch 'dgud/wx/app-file/OTP-9324' into dev
* dgud/wx/app-file/OTP-9324:
Fix wx app file, sed didn't work on all platforms
| -rw-r--r-- | lib/wx/src/Makefile | 7 | ||||
| -rw-r--r-- | lib/wx/src/wx.appup.src | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 3cc668375f..46bc06271c 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2008-2010. All Rights Reserved. +# Copyright Ericsson AB 2008-2011. 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 @@ -29,8 +29,7 @@ ERL_COMPILE_FLAGS += -I$(ERLINC) +warn_unused_vars ARCHIVE = wx-$(VSN).ez -ErlMods = \ - wx \ +ErlMods = wx \ wx_object \ wxe_master \ wxe_server \ @@ -44,7 +43,7 @@ GEN_FILES = $(wildcard gen/wx*.erl) \ gen/glu.erl \ gen/gl.erl -GEN_MODS = $(GEN_FILES:gen/%.erl= %,\n ) +GEN_MODS = $(GEN_FILES:gen/%.erl=%,) GEN_HRL = \ $(EGEN)/wxe_debug.hrl \ diff --git a/lib/wx/src/wx.appup.src b/lib/wx/src/wx.appup.src index c02edd2afb..1102af612e 100644 --- a/lib/wx/src/wx.appup.src +++ b/lib/wx/src/wx.appup.src @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010. All Rights Reserved. +%% Copyright Ericsson AB 2010-2011. 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 @@ -18,5 +18,6 @@ %% %CopyrightEnd% {"%VSN%", + [ ], [ ] }. |