[wx] Cleanup Makefiles

Remove old "outside" otp building support.

5 files changed, 32 insertions, 88 deletions

diff --git a/lib/wx/examples/Makefile b/lib/wx/examples/Makefile
index ae0ed687eb..48fccc88f7 100644
--- a/lib/wx/examples/Makefile
+++ b/lib/wx/examples/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2009. 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%
 #
 
@@ -22,24 +22,8 @@ include ../config.mk
 
 SUBDIRS = demo sudoku simple xrc
 
-ifeq ($(INSIDE_ERLSRC),true)
 SUB_DIRECTORIES=$(SUBDIRS)
 # ----------------------------------------------------
 # Default Subdir Targets
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_subdir.mk
-
-else
-# standalone build
-opt debug clean:
-	@for d in $(SUBDIRS); do         \
-	   if test ! -d $$d ; then        \
-	       echo "=== Skipping subdir $$d" ; \
-	   else                   \
-	      (cd $$d && $(MAKE) $@) ; \
-	   fi ;                        \
-	done
-
-docs: 
-
-endif
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
-
-
-
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
-
-
diff --git a/lib/wx/examples/sudoku/Makefile b/lib/wx/examples/sudoku/Makefile
index a7cbf85e03..89919ff50c 100644
--- a/lib/wx/examples/sudoku/Makefile
+++ b/lib/wx/examples/sudoku/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%
 #
 
@@ -25,7 +25,7 @@ SRC = .
 BIN = .
 ERLINC = $(TOPDIR)/include
 ERLC = erlc
-TESTMODS = sudoku sudoku_board sudoku_game sudoku_gui 
+TESTMODS = sudoku sudoku_board sudoku_game sudoku_gui
 TESTTARGETS = $(TESTMODS:%=%.beam)
 TESTSRC = $(TESTMODS:%=%.erl)
 
@@ -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 sudoku 
-
-ifneq ($(INSIDE_ERLSRC),true)
+	erl -smp -detached -pa $(TOPDIR)/ebin -s sudoku
 
-%.beam: %.erl
-	$(ERLC) -W -I$(ERLINC)  -bbeam -o$(BIN) $<
-
-else
 EXRELSYSDIR = $(RELSYSDIR)/examples/sudoku
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-docs: 
+docs:
 
 release_spec: opt
 	$(INSTALL_DIR) $(EXRELSYSDIR)
@@ -59,8 +53,3 @@ release_spec: opt
 release_tests_spec:
 
 release_docs_spec:
-
-endif
-
-
-
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
-