4 files changed, 84 insertions, 2 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 6c636bb51f..161ef82c57 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -44,6 +44,8 @@ GEN_FILES       = $(wildcard gen/wx*.erl) \
 		gen/glu.erl \
 		gen/gl.erl
 
+GEN_MODS        = $(GEN_FILES:gen/%.erl=  %,\n )
+
 GEN_HRL		= \
 		$(EGEN)/gl_debug.hrl \
 		$(EGEN)/wxe_debug.hrl \
@@ -56,15 +58,25 @@ EXT_HRL		= $(ERLINC)/wx.hrl \
 TARGET_FILES    = $(ErlMods:%=$(EBIN)/%.beam) $(GEN_FILES:gen/%.erl=$(EBIN)/%.beam) 
 HEADER_FILES    = $(HRL_FILES) $(GEN_HRL) $(EXT_HRL)
 
+APP_FILE   = wx.app
+APP_SRC    = $(APP_FILE).src
+APP_TARGET = $(EBIN)/$(APP_FILE)
+
+APPUP_FILE   = wx.appup
+APPUP_SRC    = $(APPUP_FILE).src
+APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
+
 # Targets
-debug opt: $(TARGET_FILES)
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:  
 	rm -f $(TARGET_FILES) 
+	rm -f $(APP_TARGET) $(APPUP_TARGET)
 	rm -f *~
 
 complete_clean: 
 	rm -f $(TARGET_FILES) 
+	rm -f $(APP_TARGET) $(APPUP_TARGET)
 	rm -f $(GEN_FILES)
 	rm -f $(GenHrl)
 	rm -f *~
@@ -75,6 +87,17 @@ docs:
 archive: opt
 	(cd ../..; zip -0 wx/$(ARCHIVE) wx wx/ebin wx/ebin/*)
 
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk Makefile
+	sed -e 's;%GEN_MODS%;$(GEN_MODS);' $< > [email protected]
+	sed -e 's;%VSN%;$(VSN);' [email protected] > $@
+	rm [email protected]
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk Makefile
+	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # Rules
 $(EBIN)/%.beam: $(ESRC)/%.erl $(HEADER_FILES)
@@ -97,6 +120,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
 #	$(INSTALL_DATA) ../$(ARCHIVE) $(RELEASE_PATH)/lib
 
 release_docs_spec:
diff --git a/lib/wx/src/wx.app.src b/lib/wx/src/wx.app.src
new file mode 100644
index 0000000000..e13982b0c1
--- /dev/null
+++ b/lib/wx/src/wx.app.src
@@ -0,0 +1,37 @@
+%% This is an -*- erlang -*- file.
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+
+{application, wx,
+ [{description, "Yet another graphics system"},
+  {vsn, "%VSN%"},
+  {modules,
+   [
+    %% Generated modules
+  %GEN_MODS%
+    %% Handcrafted modules
+    wx,
+    wx_object,
+    wxe_master,
+    wxe_server,
+    wxe_util
+   ]},
+  {registered, []},
+  {applications, [stdlib, kernel]},
+  {env, []}
+ ]}.
diff --git a/lib/wx/src/wx.appup.src b/lib/wx/src/wx.appup.src
new file mode 100644
index 0000000000..c02edd2afb
--- /dev/null
+++ b/lib/wx/src/wx.appup.src
@@ -0,0 +1,22 @@
+%% This is an -*- erlang -*- file.
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+
+{"%VSN%",
+ [ ]
+}.
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index 70872775fb..8810763210 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -33,7 +33,6 @@
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
--compile(export_all).
 
 -record(state, {cb_port,  %% Callback port and to erlang messages goes via it.
 		users,    %% List of wx servers, needed ??