Clean up examples

native_client_sdk/src/examples/hello_world_glibc/Makefile

Index: native_client_sdk/src/examples/hello_world_glibc/Makefile
===================================================================
--- native_client_sdk/src/examples/hello_world_glibc/Makefile	(revision 120871)
+++ native_client_sdk/src/examples/hello_world_glibc/Makefile	(working copy)
@@ -7,194 +7,71 @@
 #   http://www.gnu.org/software/make/manual/make.html
 #
 
-#
-# Project information
-#
-# These variables store project specific settings for the project name
-# build flags, files to copy or install.  In the examples it is typically
-# only the list of sources and project name that will actually change and
-# the rest of the makefile is boilerplate for defining build rules.
-#
-PROJECT:=hello_world
-CXX_SOURCES:=hello_world.cc helper_functions.cc
-COPY_FILES:=hello_world.html
-LDFLAGS:=-lppapi_cpp -lppapi
 
-
 #
 # Get pepper directory for toolchain and includes.
 #
-# If PEPPER_ROOT is not set, then assume it can be found a two directories up,
+# If NACL_SDK_ROOT is not set, then assume it can be found a two directories up,
 # from the default example directory location.
 #
 THIS_MAKEFILE:=$(abspath $(lastword $(MAKEFILE_LIST)))
-PEPPER_ROOT?=$(abspath $(dir $(THIS_MAKEFILE))../..)
+NACL_SDK_ROOT?=$(abspath $(dir $(THIS_MAKEFILE))../..)
 
-# Project Build flags
-DEFINES:=
-INCLUDES:=
-WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -pedantic -Werror
-CXXFLAGS:= -shared -pthread -std=gnu++98 $(WARNINGS) $(DEFINES) $(INCLUDES)
 
 #
-# Compute tool paths
+# Project Build flags
 #
-#
-OSNAME:=$(shell python $(PEPPER_ROOT)/tools/getos.py)
-TC_PATH:=$(abspath $(PEPPER_ROOT)/toolchain/$(OSNAME)_x86_glibc)
-CC:=$(TC_PATH)/bin/i686-nacl-gcc
-CXX:=$(TC_PATH)/bin/i686-nacl-g++
-STRIP:=$(TC_PATH)/bin/i686-nacl-strip
+# Turns on warnings (-Wxxx), builds with zero optimization (-O0) and adds debug
+# information (-g) for correctness and ease of debugging.
+WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -Werror -pedantic 
+CFLAGS:=-pthread -O0 -g $(WARNINGS)
 
-#
-# Create shell aliases
-#
-# Create Python based aliases for common shell commands like copy or move.
-#
-COPY:= python $(PEPPER_ROOT)/tools/oshelpers.py cp
-MKDIR:= python $(PEPPER_ROOT)/tools/oshelpers.py mkdir
-RM:= python $(PEPPER_ROOT)/tools/oshelpers.py rm
-MV:= python $(PEPPER_ROOT)/tools/oshelpers.py mv
 
 #
-# NMF Manifiest generation
+# Compute path to compiler
 #
-NMF:=python $(PEPPER_ROOT)/tools/create_nmf.py
-NMF+=-D $(TC_PATH)/x86_64-nacl/bin/objdump
-NMF_PATHS:=-L $(TC_PATH)/x86_64-nacl/lib32 -L $(TC_PATH)/x86_64-nacl/lib
+OSNAME:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py)
+TC_PATH:=$(abspath $(NACL_SDK_ROOT)/toolchain/$(OSNAME)_x86_glibc)
 
+
+# Alias for C++ compiler
+CC:=$(TC_PATH)/bin/i686-nacl-gcc
+
+
 #
 # Disable DOS PATH warning when using Cygwin based tools Windows
 #
 CYGWIN ?= nodosfilewarning
 export CYGWIN
 
-#
-# Define a macro for copying files to the configuration directory
-# 
-# Copys a source file to the destination directory, removing the base path
-# from the source.  Adds a dependency to the destination directory in case it
-# needs to be created.
-#
-# $(1) = Source file
-# $(2) = Destination directory
-define FILE_COPY
-$(2)/$(notdir $(1)) : $(1) | $(2)
-	$(COPY) $(1) $(2)
-$(2)_COPIES+=$(2)/$(notdir $(1))
-endef
 
+# Default target is everything
+all : hello_world_x86_32.nexe hello_world_x86_64.nexe hello_world.nmf
 
-# Declare the ALL target first, to make the 'all' target the default build
-all: DEBUG RELEASE
+# Define compile and link rule for 32 bit (-m32) nexe
+hello_world_x86_32.nexe : hello_world.c $(THIS_MAKE)
+	$(CC) -o $@ $< -m32 -O0 -g $(CFLAGS) -lppapi
 
+# Define compile and link rule for 64 bit (-m64) nexe
+hello_world_x86_64.nexe : hello_world.c $(THIS_MAKE)
+	$(CC) -o $@ $< -m64 -O0 -g $(CFLAGS) -lppapi
 
 #
-# Debug Build rules.
+# NMF Manifiest generation
 #
-DEBUG_x86_32_FLAGS:=-m32 -O0 -g
-DEBUG_x86_64_FLAGS:=-m64 -O0 -g
-DEBUG_x86_32_OBJS:=$(patsubst %.cc,DBG/x86_32/%.o,$(CXX_SOURCES))
-DEBUG_x86_64_OBJS:=$(patsubst %.cc,DBG/x86_64/%.o,$(CXX_SOURCES))
+# Use the python script create_nmf to scan the binaries for dependencies using
+# objdump.  Pass in the (-L) paths to the default library toolchains so that we
+# can find those libraries and have it automatically copy the files (-s) to
+# the target directory for us.
+NMF:=python $(NACL_SDK_ROOT)/tools/create_nmf.py
+NMF_ARGS:=-D $(TC_PATH)/x86_64-nacl/bin/objdump
+NMF_PATHS:=-L $(TC_PATH)/x86_64-nacl/lib32 -L $(TC_PATH)/x86_64-nacl/lib
 
-# Create DBG configuration directories
-DBG:
-	$(MKDIR) -p $@
+hello_world.nmf : hello_world_x86_64.nexe hello_world_x86_32.nexe
+	echo $(NMF) $(NMF_ARGS) -s . -o $@ $(NMF_PATHS) $^
+	$(NMF) $(NMF_ARGS) -s . -o $@ $(NMF_PATHS) $^
 
-DBG/x86_32:
-	$(MKDIR) -p $@
-
-DBG/x86_64:
-	$(MKDIR) -p $@
-
-# Copy all files to that config
-$(foreach src,$(COPY_FILES),$(eval $(call FILE_COPY,$(src),DBG)))
-
-# Include generated dependencies
--include DBG/x86_32/*.d
--include DBG/x86_64/*.d
-
-# Define compile rule for all 32 bit debug objects
-DBG/x86_32/%.o : %.cc $(THIS_MAKE) | DBG/x86_32
-	$(CXX) -o $@ -c $< $(DEBUG_x86_32_FLAGS) $(CXXFLAGS) -MMD -MF $@.d
-
-# Define compile rule for all 64 bit debug objects
-DBG/x86_64/%.o : %.cc $(THIS_MAKE) | DBG/x86_64
-	$(CXX) -o $@ -c $< $(DEBUG_x86_64_FLAGS) $(CXXFLAGS) -MMD -MF $@.d
-
-# Define Link rule for 32 bit debug NEXE
-DBG/$(PROJECT)_x86_32.nexe : $(DEBUG_x86_32_OBJS)
-	$(CXX) -o $@ $^ $(DEBUG_x86_32_FLAGS) $(LDFLAGS)
-
-# Define Link rule for 64 bit debug NEXE
-DBG/$(PROJECT)_x86_64.nexe : $(DEBUG_x86_64_OBJS)
-	$(CXX) -o $@ $^ $(DEBUG_x86_64_FLAGS) $(LDFLAGS)
-
-# Define rule for building NMF file and copying dependencies
-DBG/$(PROJECT).nmf : DBG/$(PROJECT)_x86_64.nexe DBG/$(PROJECT)_x86_32.nexe
-	$(NMF) -o $@ -s DBG $(NMF_PATHS) $^
-
-# Define a DEBUG alias to build the debug version
-DBG_NEXES:= DBG/$(PROJECT)_x86_32.nexe DBG/$(PROJECT)_x86_64.nexe
-.PHONY : DEBUG RUN_DEBUG
-DEBUG : $(DBG_NEXES) DBG/$(PROJECT).nmf $(DBG_COPIES)
-
-# Define a RUN_DEBUG alias to build and server the DEBUG version
-RUN_DEBUG: DEBUG
-	cd DBG && python ../../httpd.py
-
-
-#
-# Release build rules.
-#
-RELEASE_x86_32_FLAGS:=-m32 -O2 -g
-RELEASE_x86_64_FLAGS:=-m64 -O2 -g
-RELEASE_x86_32_OBJS:=$(patsubst %.cc,REL/x86_32/%.o,$(CXX_SOURCES))
-RELEASE_x86_64_OBJS:=$(patsubst %.cc,REL/x86_64/%.o,$(CXX_SOURCES))
-
-REL:
-	$(MKDIR) -p $@
-
-REL/x86_32:
-	$(MKDIR) -p $@
-
-REL/x86_64:
-	$(MKDIR) -p $@
-
-# Copy all files to that config
-$(foreach src,$(COPY_FILES),$(eval $(call FILE_COPY,$(src),REL)))
-
-# Include generated dependencies
--include REL/x86_32/*.d
--include REL/x86_64/*.d
-
-# Define compile rule for all 32 bit debug objects
-REL/x86_32/%.o : %.cc $(THIS_MAKE) | REL/x86_32
-	$(CXX) -o $@ -c $< $(RELEASE_x86_32_FLAGS) $(CXXFLAGS) -MMD -MF $@.d
-
-# Define compile rule for all 64 bit debug objects
-REL/x86_64/%.o : %.cc $(THIS_MAKE) | REL/x86_64
-	$(CXX) -o $@ -c $< $(RELEASE_x86_64_FLAGS) $(CXXFLAGS) -MMD -MF $@.d
-
-# Define Link rule for 32 bit optimized and stripped NEXE
-REL/$(PROJECT)_x86_32.nexe : $(RELEASE_x86_32_OBJS)
-	$(CXX) -o $@.unstripped $^ $(RELEASE_x86_32_FLAGS) $(LDFLAGS)
-	$(STRIP) $< -o $@
-
-# Define Link rule for 64 bit optimized and stripped NEXE
-REL/$(PROJECT)_x86_64.nexe : $(RELEASE_x86_64_OBJS)
-	$(CXX) -o $@.unstripped $^ $(RELEASE_x86_64_FLAGS) $(LDFLAGS)
-	$(STRIP) $@.unstripped -o $@
-
-# Define rule for building NMF file and copying dependencies
-REL/$(PROJECT).nmf : REL/$(PROJECT)_x86_64.nexe REL/$(PROJECT)_x86_32.nexe
-	$(NMF) -o $@ -s REL $(NMF_PATHS) $^
-
-# Define a RELEASE alias to build the debug version
-.PHONY : RELEASE RUN_RELEASE
-REL_NEXES:=REL/$(PROJECT)_x86_32.nexe REL/$(PROJECT)_x86_64.nexe 
-RELEASE : $(REL_NEXES) REL/$(PROJECT).nmf $(REL_COPIES)
-
-# Define a RUN_RELEASE alias to build and server the RELEASE version
-RUN_RELEASE: RELEASE
-	cd REL && python ../../httpd.py
+# Define a phony rule so it always runs, to build nexe and start up server.
+.PHONY: RUN 
+RUN: all
+	python ../httpd.py