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/simple/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/simple/Makefile')
| -rw-r--r-- | lib/wx/examples/simple/Makefile | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/lib/wx/examples/simple/Makefile b/lib/wx/examples/simple/Makefile index 295e739202..0178aea890 100644 --- a/lib/wx/examples/simple/Makefile +++ b/lib/wx/examples/simple/Makefile @@ -1,19 +1,19 @@ # # %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 # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # @@ -35,21 +35,15 @@ clean: rm -f $(TESTTARGETS) rm -f *~ core erl_crash.dump -docs: +docs: run: opt - erl -smp -detached -pa $(TOPDIR)/ebin -s hello - -ifneq ($(INSIDE_ERLSRC),true) + erl -smp -detached -pa $(TOPDIR)/ebin -s hello -%.beam: %.erl - $(ERLC) -W -I$(ERLINC) -bbeam -o$(BIN) $< - -else EXRELSYSDIR = $(RELSYSDIR)/examples/simple include $(ERL_TOP)/make/otp_release_targets.mk -docs: +docs: release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) @@ -59,7 +53,3 @@ release_spec: opt release_tests_spec: release_docs_spec: - -endif - - |