| Index: native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| diff --git a/native_client_sdk/src/examples/hello_world_interactive/Makefile b/native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| index 747d52c06a21e368f76d4acf764ea384b8cd3aa2..cbf342e548252c22fd897ada289e9e50b81bb693 100644
|
| --- a/native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| +++ b/native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| @@ -14,9 +14,19 @@
|
| #
|
| # By default we will build a Debug configuration using the GCC newlib toolcahin
|
| # to override this, specify TOOLCHAIN=newlib|glibc or CONFIG=Debug|Release on
|
| -# the make command-line or in this file prior to including common.mk
|
| +# the make command-line or in this file prior to including common.mk. The
|
| +# toolchain we use by default will be the first valid one listed
|
| +VALID_TOOLCHAINS:=newlib glibc pnacl linux win
|
| +
|
| +
|
| +#
|
| +# Get pepper directory for toolchain and includes.
|
| +#
|
| +# If NACL_SDK_ROOT is not set, then assume it can be found relative to
|
| +# to this Makefile.
|
| #
|
| -include common.mk
|
| +NACL_SDK_ROOT?=$(abspath $(CURDIR)/../..)
|
| +include $(NACL_SDK_ROOT)/tools/common.mk
|
|
|
|
|
| #
|
| @@ -45,7 +55,8 @@ SOURCES=hello_world.cc helper_functions.cc
|
| # We break this list down into two parts, the set we need to rebuild (DEPS)
|
| # and the set we do not.
|
| #
|
| -LIBS=ppapi_cpp ppapi pthread
|
| +DEPS=ppapi_cpp
|
| +LIBS=$(DEPS) ppapi pthread
|
|
|
|
|
| #
|
| @@ -61,7 +72,7 @@ $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src))))
|
| #
|
| # Use the link macro for this target on the list of sources.
|
| #
|
| -$(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS)))
|
| +$(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS)))
|
|
|
| #
|
| # Specify the NMF to be created with no additional arugments.
|
|
|