diff options
| author | Dan Gudmundsson <[email protected]> | 2011-12-10 09:50:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-12-10 09:50:23 +0100 |
| commit | 8d03b919f06db216a271bc90cf90d9c697a5a5c8 (patch) | |
| tree | 49dc8f7773e4ee0db65c84b8a79fdb19bad6663d /lib/wx/Makefile | |
| parent | f20b520b0d2d990ab70b56345b63a8b508edde1a (diff) | |
| parent | 44d21ab66987c4dc4df461901600618efd2907c3 (diff) | |
| download | otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.tar.gz otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.tar.bz2 otp-8d03b919f06db216a271bc90cf90d9c697a5a5c8.zip | |
Merge branch 'dgud/wx/behaviour-spec'
* dgud/wx/behaviour-spec:
[wx] Add handle_cast to avoid behaviour warning
[wx] Avoid missing wx_object behaviour warning
[wx] Remove warnings Add an additional cast when casting buffer offsets, to remove warnings "cast to pointer from integer of different size"
[wx] Add callback specs to wx_object
Diffstat (limited to 'lib/wx/Makefile')
| -rw-r--r-- | lib/wx/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/wx/Makefile b/lib/wx/Makefile index 0bc89e08ad..9a75b2e36e 100644 --- a/lib/wx/Makefile +++ b/lib/wx/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2008-2010. All Rights Reserved. +# Copyright Ericsson AB 2008-2011. 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 @@ -18,12 +18,19 @@ # include ./vsn.mk -include ./config.mk -SUBDIRS = src -ifeq ($(CAN_BUILD_DRIVER), true) -SUBDIRS += c_src -endif -SUBDIRS += examples doc/src + +ifdef TERTIARY_BOOTSTRAP + INSIDE_ERLSRC = true + SUBDIRS = src +else # Normal build + include ./config.mk + SUBDIRS = src + ifeq ($(CAN_BUILD_DRIVER), true) + SUBDIRS += c_src + endif + SUBDIRS += examples doc/src +endif #TERTIARY_BOOTSTRAP + CLEANDIRS = $(SUBDIRS) api_gen ifeq ($(INSIDE_ERLSRC),true) @@ -32,6 +39,7 @@ ifeq ($(INSIDE_ERLSRC),true) # Default Subdir Targets # ---------------------------------------------------- SUB_DIRECTORIES=$(SUBDIRS) + include $(ERL_TOP)/make/otp_subdir.mk else # we are building standalone wxErlang |