diff options
author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
commit | 77426493dc04593cc00c166e6fb17dd5fc985255 (patch) | |
tree | 868060b6e16d4e9f6a347202ac1ba9c78761f404 /lib/wx/examples/xrc/Makefile | |
parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
parent | 6628dbe4ba097a5abed4ca7439a5b515adb0f556 (diff) | |
download | otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.gz otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.bz2 otp-77426493dc04593cc00c166e6fb17dd5fc985255.zip |
Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
[wx] Add simple taskbaricon test
[wx] Add missing stc function
[wx] Add wxTaskBarIcon class
[wx] Doc overloaded functions
[wx] Fix spec errors
[wx] Fix api bugs in wxDC
[wx] Fix wxGraphicContext bugs
[wx] Remove redundant erts version check
[wx] Generated types for all wx classes
[wx] Generate GL api from latest version
[wx] Cleanup Makefiles
Diffstat (limited to 'lib/wx/examples/xrc/Makefile')
-rw-r--r-- | lib/wx/examples/xrc/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/wx/examples/xrc/Makefile b/lib/wx/examples/xrc/Makefile index 79d86ac1b9..341fdbb2cc 100644 --- a/lib/wx/examples/xrc/Makefile +++ b/lib/wx/examples/xrc/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2009-2011. All Rights Reserved. +# Copyright Ericsson AB 2009-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 @@ -49,12 +49,6 @@ docs: run: opt erl -smp -detached -pa $(TOPDIR)/ebin -s xrc -ifneq ($(INSIDE_ERLSRC),true) - -%.beam: %.erl - $(ERLC) -W -I$(ERLINC) -bbeam -o$(BIN) $< - -else EXRELSYSDIR = $(RELSYSDIR)/examples/xrc include $(ERL_TOP)/make/otp_release_targets.mk @@ -71,7 +65,5 @@ release_tests_spec: release_docs_spec: -endif - |