| Index: native_client_sdk/src/libraries/nacl_mounts_test/Makefile
|
| diff --git a/native_client_sdk/src/examples/hello_world_interactive/Makefile b/native_client_sdk/src/libraries/nacl_mounts_test/Makefile
|
| similarity index 64%
|
| copy from native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| copy to native_client_sdk/src/libraries/nacl_mounts_test/Makefile
|
| index 747d52c06a21e368f76d4acf764ea384b8cd3aa2..3f76a15ab1b1d360a00449821741074c7656de67 100644
|
| --- a/native_client_sdk/src/examples/hello_world_interactive/Makefile
|
| +++ b/native_client_sdk/src/libraries/nacl_mounts_test/Makefile
|
| @@ -14,23 +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
|
| -#
|
| -include 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 win
|
| +INCLUDES+=$(NACL_SDK_ROOT)/include/gtest/internal
|
|
|
| #
|
| -# Target Name
|
| -#
|
| -# The base name of the final NEXE, also the name of the NMF file containing
|
| -# the mapping between architecture and actual NEXE.
|
| -#
|
| -TARGET=hello_world_interactive
|
| -
|
| +# Get pepper directory for toolchain and includes.
|
| #
|
| -# List of sources to compile
|
| +# If NACL_SDK_ROOT is not set, then assume it can be found relative to
|
| +# to this Makefile.
|
| #
|
| -SOURCES=hello_world.cc helper_functions.cc
|
| +NACL_SDK_ROOT?=$(abspath $(CURDIR)/../..)
|
| +include $(NACL_SDK_ROOT)/tools/common.mk
|
|
|
|
|
| #
|
| @@ -45,8 +41,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=nacl_mounts ppapi_cpp
|
| +LIBS=gtest_ppapi gtest gmock $(DEPS) ppapi pthread
|
|
|
| #
|
| # Use the library dependency macro for each dependency
|
| @@ -54,16 +50,35 @@ LIBS=ppapi_cpp ppapi pthread
|
| $(foreach dep,$(DEPS),$(eval $(call DEPEND_RULE,$(dep))))
|
|
|
| #
|
| +# Target Name
|
| +#
|
| +# The base name of the final NEXE, also the name of the NMF file containing
|
| +# the mapping between architecture and actual NEXE.
|
| +#
|
| +TARGET=nacl_mount_test
|
| +
|
| +#
|
| +# List of sources to compile
|
| +#
|
| +SOURCES:=kernel_object_test.cc kernel_proxy_mock.cc kernel_proxy_test.cc
|
| +SOURCES+=kernel_wrap_test.cc module.cc mount_node_test.cc
|
| +SOURCES+=mount_html5fs_test.cc mount_test.cc path_test.cc
|
| +SOURCES+=pepper_interface_mock.cc
|
| +
|
| +#
|
| # Use the compile macro for each source.
|
| #
|
| -$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src))))
|
| +$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),-Wno-switch-enum -Wno-variadic-macros)))
|
|
|
| #
|
| # 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.
|
| #
|
| $(eval $(call NMF_RULE,$(TARGET),))
|
| +
|
| +
|
| +
|
|
|