diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:26:28 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:26:28 +0100 |
| commit | 12bbb4aea95bbf0258075f79308f8539859fe6d5 (patch) | |
| tree | a81c7cc440b7b50806270afd2e48aef35a812c8e /lib/wx/examples/demo/Makefile | |
| parent | c56a89474b95f5460cc7add09f0258815596e1ac (diff) | |
| parent | f06de6450bbbd324a0784780d892fa69908a2126 (diff) | |
| download | otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.tar.gz otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.tar.bz2 otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/examples/demo/Makefile')
| -rw-r--r-- | lib/wx/examples/demo/Makefile | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/lib/wx/examples/demo/Makefile b/lib/wx/examples/demo/Makefile index 3f054ec75f..872723fb98 100644 --- a/lib/wx/examples/demo/Makefile +++ b/lib/wx/examples/demo/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% # @@ -52,7 +52,7 @@ TESTMODS = \ ex_static \ ex_textCtrl \ ex_treeCtrl \ - ex_graphicsContext + ex_graphicsContext TESTTARGETS = $(TESTMODS:%=%.beam) @@ -64,21 +64,15 @@ clean: rm -f $(TESTTARGETS) rm -f *~ core erl_crash.dump -docs: +docs: run: opt - erl -smp -detached -pa $(TOPDIR)/ebin -s demo - -ifneq ($(INSIDE_ERLSRC),true) + erl -smp -detached -pa $(TOPDIR)/ebin -s demo -%.beam: %.erl - $(ERLC) -W -I$(ERLINC) -bbeam -o$(BIN) $< - -else EXRELSYSDIR = $(RELSYSDIR)/examples/demo include $(ERL_TOP)/make/otp_release_targets.mk -docs: +docs: release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) @@ -89,8 +83,3 @@ release_spec: opt release_tests_spec: release_docs_spec: - -endif - - - |