fixed fl makefiles that Julian didn't fix correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/configure b/contrib/configure
index 9cb5da925ff351eedffd03d655726a20b7680887..27de39350808131fbd4ea515ebdf9f4fc1ac1bf1 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -838,11 +838,12 @@ trap 'rm -fr `echo "
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile

-            samples/fl/fl_demo1
-            samples/fl/fl_demo2
-            samples/fl/fl_sample1
-            samples/fl/fl_sample2
-            samples/fl/fl_sample3
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile


@@ -925,8 +926,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-            src/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"src/Makefile

             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile


@@ -952,11 +952,12 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile

-            samples/fl/fl_demo1
-            samples/fl/fl_demo2
-            samples/fl/fl_sample1
-            samples/fl/fl_sample2
-            samples/fl/fl_sample3
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

diff --git a/contrib/configure.in b/contrib/configure.in
index 6d823e1b2993e7670c15bc4053a8846d919b023e..2e485da09a54c8d1a93e74d64e0bbbb80f133de2 100644 (file)
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -63,6 +63,7 @@ AC_OUTPUT([
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile

+            samples/fl/Makefile

             samples/fl/fl_demo1/Makefile
             samples/fl/fl_demo2/Makefile
             samples/fl/fl_sample1/Makefile
             samples/fl/fl_demo1/Makefile
             samples/fl/fl_demo2/Makefile
             samples/fl/fl_sample1/Makefile