3 files changed, 16 insertions, 7 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 283396930..a577475 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -602,6 +602,7 @@ EXAMPLE_LIST = [
   'gamepad',
   'geturl',
   'hello_nacl_mounts',
+  'hello_world_stdio',
   'hello_world',
   'hello_world_gles',
   'hello_world_interactive',
@@ -619,6 +620,7 @@ LIBRARY_LIST = [
   'ppapi',
   'ppapi_cpp',
   'ppapi_gles2',
+  'ppapi_main',
   'pthread',
   'zlib',
 ]
@@ -666,7 +668,8 @@ def BuildStepCopyExamples(pepperdir, toolchains, build_experimental, clobber):
   # Copy individual files
   files = ['favicon.ico', 'httpd.cmd']
   for filename in files:
-    oshelpers.Copy(['-v', os.path.join(SDK_EXAMPLE_DIR, filename), exampledir])
+    oshelpers.Copy(['-v', os.path.join(SDK_EXAMPLE_DIR, filename),
+                   exampledir])
 
   args = ['--dstroot=%s' % pepperdir, '--master']
   for toolchain in toolchains:
diff --git a/native_client_sdk/src/build_tools/generate_index.py b/native_client_sdk/src/build_tools/generate_index.py
index d733162..5bfe23a 100644
--- a/native_client_sdk/src/build_tools/generate_index.py
+++ b/native_client_sdk/src/build_tools/generate_index.py
@@ -57,10 +57,14 @@ mulithreading...</p></dd>
 """,
   'Tools': """
 <h3>Using the Tools</h3>
-<dd><p>The following "hello_world" examples, show the basic outline of a Native
-Client application.  The make files in each of the examples below show a
-simple way to build a NaCl application using
-<a href="http://www.gnu.org/software/make/manual/make.html">GNU Make</a>.
+<dd><p>The following "hello_world" examples, show the basic outline of a
+several types of Native Client applications.   The simplest, "Hello World Stdio"
+uses several provided libraries to simplify startup and provides a
+simplified make showing a single build configuration.  The other examples in
+this SDK however, are designed to build and run with multiple toolsets, build
+configurations, etc...
+making the build much more complex.  In all cases we are using <a
+href="http://www.gnu.org/software/make/manual/make.html">GNU Make</a>.
 See the link for further information.
 </p></dd>
 """,
diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py
index 786a1e7..af3f839 100755
--- a/native_client_sdk/src/build_tools/generate_make.py
+++ b/native_client_sdk/src/build_tools/generate_make.py
@@ -217,7 +217,8 @@ DSC_FORMAT = {
         'DEFINES': (list, '', False),
         'LDFLAGS': (list, '', False),
         'INCLUDES': (list, '', False),
-        'LIBS' : (list, '', False)
+        'LIBS' : (list, '', False),
+        'DEPS' : (list, '', False)
     }, True),
     'HEADERS': (list, {
         'FILES': (list, '', True),
@@ -500,7 +501,8 @@ def ProcessProject(srcroot, dstroot, desc, toolchains):
 
     # Add Makefile and make.bat
     repdict = GenerateReplacements(desc, tools)
-    WriteReplaced(template, make_path, repdict)
+    if not 'Makefile' in desc.get('DATA', []):
+      WriteReplaced(template, make_path, repdict)
 
   outdir = os.path.dirname(os.path.abspath(make_path))
   pepperdir = os.path.dirname(os.path.dirname(outdir))