[clib] Drop 'generated' from CLib samples

SConstruct

@@ -2012,9 +2012,9 @@ if env["clib_legacy"]:
     install(env.RecursiveInstall, '$inst_sampledir/clib_legacy',
             'samples/clib_legacy', exclude=sampledir_excludes)
 else:
-    SConscript("build/samples/clib_generated/SConscript")
+    SConscript("build/samples/clib/SConscript")
     install(env.RecursiveInstall, "$inst_sampledir/clib",
-            "samples/clib_generated", exclude=sampledir_excludes)
+            "samples/clib", exclude=sampledir_excludes)
 
 if env['f90_interface'] == 'y':
     SConscript('build/samples/f77/SConscript')

doc/SConscript

@@ -103,8 +103,8 @@ if localenv['sphinx_docs']:
                                      clib_file, Copy("$TARGET", "$SOURCE")))
 
     # Gather clib_generated sample files
-    clib_files = Glob("#samples/clib_generated/*.c")
-    clib_files.append(File("#samples/clib_generated/README.rst"))
+    clib_files = Glob("#samples/clib/*.c")
+    clib_files.append(File("#samples/clib/README.rst"))
     for clib3_file in clib_files:
         env.Depends(sphinxdocs,
                     localenv.Command(

test_problems/SConscript

@@ -249,7 +249,7 @@ if env["clib_legacy"]:
          '#build/samples/clib_legacy/demo', 'clib_demo_blessed.txt')
 else:
     Test('clib-demo', 'clib',
-         '#build/samples/clib_generated/demo', 'clib_demo_blessed.txt')
+         '#build/samples/clib/demo', 'clib_demo_blessed.txt')
 
 # C++ programs from User Guide
 Test('cxx-guide-demo1a', 'cxx_userguide', '#build/samples/userguide/demo1a',