diff --git a/contrib/configure b/contrib/configure
index 095ce456a5..a3631abeb1 100755
--- a/contrib/configure
+++ b/contrib/configure
@@ -827,27 +827,28 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
             src/Makefile
+            src/deprecated/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
             src/svg/Makefile	    
             src/xrc/Makefile
-            src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/applet/Makefile
             src/fl/Makefile
             src/net/Makefile
             samples/Makefile
+            samples/deprecated/Makefile
+            samples/deprecated/proplist/Makefile
+            samples/deprecated/resource/Makefile
+            samples/deprecated/treelay/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
             samples/svg/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
             samples/gizmos/Makefile
             samples/gizmos/editlbox/Makefile
             samples/gizmos/dynsash/Makefile
@@ -952,27 +953,28 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
+            src/deprecated/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
             src/svg/Makefile	    
             src/xrc/Makefile
-            src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/applet/Makefile
             src/fl/Makefile
             src/net/Makefile
             samples/Makefile
+            samples/deprecated/Makefile
+            samples/deprecated/proplist/Makefile
+            samples/deprecated/resource/Makefile
+            samples/deprecated/treelay/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
             samples/svg/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
             samples/gizmos/Makefile
             samples/gizmos/editlbox/Makefile
             samples/gizmos/dynsash/Makefile
diff --git a/samples/configure b/samples/configure
index 7256cceb79..cb815b1d05 100755
--- a/samples/configure
+++ b/samples/configure
@@ -856,10 +856,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             ownerdrw/Makefile
             png/Makefile
             printing/Makefile
-            proplist/Makefile
             propsize/Makefile
             regtest/Makefile
-            resource/Makefile
             rotate/Makefile
             sashtest/Makefile
             shaped/Makefile
@@ -873,7 +871,6 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
-            treelay/Makefile
             typetest/Makefile
             validate/Makefile
             widgets/Makefile