diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
| commit | 77426493dc04593cc00c166e6fb17dd5fc985255 (patch) | |
| tree | 868060b6e16d4e9f6a347202ac1ba9c78761f404 /lib/wx/src/Makefile | |
| parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
| parent | 6628dbe4ba097a5abed4ca7439a5b515adb0f556 (diff) | |
| download | otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.gz otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.bz2 otp-77426493dc04593cc00c166e6fb17dd5fc985255.zip | |
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
Diffstat (limited to 'lib/wx/src/Makefile')
| -rw-r--r-- | lib/wx/src/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 4e5971de03..16b425e6f0 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -1,7 +1,7 @@ # # %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 @@ -20,7 +20,6 @@ include ../vsn.mk ifdef TERTIARY_BOOTSTRAP VSN = $(WX_VSN) - INSIDE_ERLSRC = true include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk RELSYSDIR = $(RELEASE_PATH)/lib/wx-$(VSN) @@ -119,7 +118,6 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) # ---------------------------------------------------- # Release Target # ---------------------------------------------------- -ifeq ($(INSIDE_ERLSRC), true) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -134,4 +132,3 @@ release_spec: opt # $(INSTALL_DATA) ../$(ARCHIVE) $(RELEASE_PATH)/lib release_docs_spec: -endif |