diff options
| author | Dan Gudmundsson <[email protected]> | 2014-02-14 09:52:51 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-02-14 09:52:51 +0100 |
| commit | 50093842d6e916a76e4ed42263b1b3f9489d896e (patch) | |
| tree | 189db72c1c2c126632ec592e7dfd2e6078b79851 /lib/wx/api_gen/Makefile | |
| parent | d10a115ab1e66938531b87bef20f886013e7b96b (diff) | |
| parent | 7f68f9862f133e07e4b847c91c52fcf81aee79d5 (diff) | |
| download | otp-50093842d6e916a76e4ed42263b1b3f9489d896e.tar.gz otp-50093842d6e916a76e4ed42263b1b3f9489d896e.tar.bz2 otp-50093842d6e916a76e4ed42263b1b3f9489d896e.zip | |
Merge branch 'dgud/wx/fix-cb-cleanup/OTP-11699'
* dgud/wx/fix-cb-cleanup/OTP-11699:
wx: Test fixes compilation warning
wx: Do not warn for our own deprecated functions
wx: Rewrite eventhandling again
Diffstat (limited to 'lib/wx/api_gen/Makefile')
| -rw-r--r-- | lib/wx/api_gen/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/api_gen/Makefile b/lib/wx/api_gen/Makefile index 8adb485ba9..3e41ac7bc5 100644 --- a/lib/wx/api_gen/Makefile +++ b/lib/wx/api_gen/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2008-2012. All Rights Reserved. +# Copyright Ericsson AB 2008-2014. 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 @@ -60,7 +60,7 @@ $(GL): glxml_generated $(GL_COMP_T) glapi.conf erl -noshell -run gl_gen code && touch gl_code_generated %.beam: %.erl wx_gen.hrl gl_gen.hrl - $(ERLC) -W $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) $< -o$(EBIN) + $(ERLC) -W $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< # TODO split cleans into separate targets? complete_clean: |