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

1 files changed, 5 insertions, 49 deletions

diff --git a/lib/wx/Makefile b/lib/wx/Makefile
index 9a75b2e36e..1ec225930e 100644
--- a/lib/wx/Makefile
+++ b/lib/wx/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2008-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%
 #
 
@@ -33,53 +33,9 @@ endif #TERTIARY_BOOTSTRAP
 
 CLEANDIRS = $(SUBDIRS) api_gen
 
-ifeq ($(INSIDE_ERLSRC),true)
-# we are inside erl src
 # ----------------------------------------------------
 # Default Subdir Targets
 # ----------------------------------------------------
 SUB_DIRECTORIES=$(SUBDIRS)
 
 include $(ERL_TOP)/make/otp_subdir.mk
-else 
-# we are building standalone wxErlang
-all: opt 
-
-opt: 
-	@mkdir -p ebin
-	@mkdir -p priv
-	@mkdir -p c_src/$(SYS_TYPE)
-	@for d in $(SUBDIRS); do         \
-	   if test ! -d $$d ; then        \
-	       echo "=== Skipping subdir $$d" ; \
-	   else                   \
-	      (cd $$d && $(MAKE) $@) ; \
-	   fi ;                        \
-	done
-
-# clean, removes beam, object and target files 
-
-clean: 
-	rm -f *~
-	@for d in $(CLEANDIRS); do        \
-	   if test ! -d $$d ; then        \
-	       echo "=== Skipping subdir $$d" ; \
-	   else                        \
-	      (cd $$d && $(MAKE) $@) ; \
-	   fi ;                        \
-	done
-
-docs: 
-	(cd doc/src/ && $(MAKE) $@)
-
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-libdir      = @libdir@
-
-install: 
-	escript ./install.es $(INSTALLDIR)
-
-release: 
-	escript ./install.es --create_release
-
-endif