diff options
| author | Erlang/OTP <[email protected]> | 2010-03-25 14:32:11 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-25 14:32:11 +0000 |
| commit | 8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6 (patch) | |
| tree | 944e1f728d33b55402ab5093540fc2ff11a70fa7 /lib/wx/src/Makefile | |
| parent | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (diff) | |
| parent | 5e454b3d8ea3bf14db3afd44c34964de21770ecb (diff) | |
| download | otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.tar.gz otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.tar.bz2 otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.zip | |
Merge branch 'hawk/wx-add-app-file' into dev
* hawk/wx-add-app-file:
Add app and appup files to the wx application
OTP-8538 hawk/wx-add-app-file
Diffstat (limited to 'lib/wx/src/Makefile')
| -rw-r--r-- | lib/wx/src/Makefile | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 6c636bb51f..a9fd468959 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 2008-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 2008-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% # @@ -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: |