Update "clean" targets to properly handle core files, remove backup files,

etc. Add "install" target to test directory which installs the example programs. Install the config.h file in the examples directory. Make sure the example programs compile outside the FLTK source dir. Add example programs to fltk.list.in. Fix missing redraw() in x_cb() in FLUID... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4287 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-04-16 00:01:49 +00:00 · 2005-04-16 00:01:49 +00:00 · b41cf28662
commit b41cf28662
parent 91c3b8231d
21 changed files with 143 additions and 81 deletions
--- a/4
+++ b/4
@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.7

 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745)
+	- The example programs can now compile separate from the
+	  FLTK source distribution (STR #809)
+	- The example programs are now installed with the
+	  documentation (STR #809)
 	- Fixed the drawing of the Fl_Browser_ selection box (STR
 	  #786)
 	- Dropped Codewarrier project files and support.
--- a/FL/Makefile.in
+++ b/FL/Makefile.in
@ -1,5 +1,5 @@
 #
-# "$Id: Makefile.in,v 1.1.2.9 2004/10/18 20:22:21 easysw Exp $"
+# "$Id$"
 #
 # Header makefile for the Fast Light Tool Kit (FLTK).
 #
@ -27,6 +27,10 @@ include ../makeinclude

 all:

+clean:
+
+depend:
+
 install:
 	echo "Installing include files in $(DESTDIR)$(includedir)..."
 	-$(MKDIR) -p $(DESTDIR)$(includedir)
@ -54,5 +58,5 @@ uninstall:


 #
-# End of "$Id: Makefile.in,v 1.1.2.9 2004/10/18 20:22:21 easysw Exp $".
+# End of "$Id$".
 #
--- a/documentation/Makefile
+++ b/documentation/Makefile
@ -162,9 +162,9 @@ IMAGEFILES	= \
 		Fl_Check_Button.gif \
 		fl_choice.gif \
 		fl_color_chooser.jpg \
-		FL.gif \
 		Fl_File_Chooser.jpg \
 		Fl_File_Input.gif \
+		FL.gif \
 		Fl_Help_Dialog.gif \
 		fl_input.gif \
 		Fl_Light_Button.gif \
@ -192,6 +192,7 @@ IMAGEFILES	= \
 		Fl_Value_Input.gif \
 		Fl_Value_Output.gif \
 		hello.C.gif \
+		input_choice.jpg \
 		menubar.gif \
 		menu_button.gif \
 		menu.gif \
@ -207,6 +208,7 @@ IMAGEFILES	= \
 		valuators.gif \
 		value_slider.gif

+
 MANPAGES =	fltk.$(CAT3EXT) fltk-config.$(CAT1EXT) fluid.$(CAT1EXT)

 all:	$(MANPAGES)
@ -217,6 +219,7 @@ clean:
 	$(RM) fltk.ps
 	$(RM) fltk.pdf
 	$(RMDIR) fltk.d
+	$(RM) *~ *.bck *.bck

 depend:

@ -229,8 +232,8 @@ docdir = $(datadir)/doc/fltk
 install: $(MANPAGES)
 	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
 	-$(MKDIR) $(DESTDIR)$(docdir)
-	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
-	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
+	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
+	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
 	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
 	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--- a/fltk.list.in
+++ b/fltk.list.in
@ -31,7 +31,13 @@
 %license COPYING
 %readme README
 %version @FL_MAJOR_VERSION@.@FL_MINOR_VERSION@.@FL_PATCH_VERSION@@FL_RELEASE_VERSION@
-%description FLTK is a cross-platform GUI toolkit for C++.
+%description << EOF
+The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
+cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
+Microsoft(r) Windows(r), and MacOS(r) X.  FLTK provides modern
+GUI functionality without the bloat and supports 3D graphics via
+OpenGL(r) and its built-in GLUT emulation.
+EOF

 $prefix=@prefix@
 $exec_prefix=@exec_prefix@
@ -40,6 +46,7 @@ $datadir=@datadir@
 $includedir=@includedir@
 $libdir=@libdir@
 $mandir=@mandir@
+$docdir=@docdir@

 $CAT1EXT=@CAT1EXT@
 $CAT3EXT=@CAT3EXT@
@ -51,6 +58,59 @@ $GLDSONAME=@GLDSONAME@
 $GLLIBNAME=@GLLIBNAME@
 $FLUID=@FLUID@

+%if DSONAME
+%system aix
+f 0555 root sys $libdir/libfltk_s.a src/libfltk_s.a nostrip()
+%system hpux
+f 0555 root sys $libdir/libfltk.sl.@FL_API_VERSION@ src/libfltk.sl.@FL_API_VERSION@ nostrip()
+%system darwin
+f 0555 root sys $libdir/libfltk.@FL_API_VERSION@.dylib src/libfltk.@FL_API_VERSION@.dylib nostrip()
+%system !aix !darwin !hpux
+f 0555 root sys $libdir/libfltk.so.@FL_API_VERSION@ src/libfltk.so.@FL_API_VERSION@ nostrip()
+%system all
+
+%system aix
+f 0555 root sys $libdir/libfltk_forms_s.a src/libfltk_forms_s.a nostrip()
+%system hpux
+f 0555 root sys $libdir/libfltk_forms.sl.@FL_API_VERSION@ src/libfltk_forms.sl.@FL_API_VERSION@ nostrip()
+%system darwin
+f 0555 root sys $libdir/libfltk_forms.@FL_API_VERSION@.dylib src/libfltk_forms.@FL_API_VERSION@.dylib nostrip()
+%system !aix !darwin !hpux
+f 0555 root sys $libdir/libfltk_forms.so.@FL_API_VERSION@ src/libfltk_forms.so.@FL_API_VERSION@ nostrip()
+%system all
+
+%system aix
+f 0555 root sys $libdir/libfltk_images_s.a src/libfltk_images_s.a nostrip()
+%system hpux
+f 0555 root sys $libdir/libfltk_images.sl.@FL_API_VERSION@ src/libfltk_images.sl.@FL_API_VERSION@ nostrip()
+%system darwin
+f 0555 root sys $libdir/libfltk_images.@FL_API_VERSION@.dylib src/libfltk_images.@FL_API_VERSION@.dylib nostrip()
+%system !aix !darwin !hpux
+f 0555 root sys $libdir/libfltk_images.so.@FL_API_VERSION@ src/libfltk_images.so.@FL_API_VERSION@ nostrip()
+%system all
+%endif
+
+%if GLDSONAME
+%system aix
+f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a nostrip()
+%system hpux
+f 0555 root sys $libdir/libfltk_gl.sl.@FL_API_VERSION@ src/libfltk_gl.sl.@FL_API_VERSION@ nostrip()
+%system darwin
+f 0555 root sys $libdir/libfltk_gl.@FL_API_VERSION@.dylib src/libfltk_gl.@FL_API_VERSION@.dylib nostrip()
+%system !aix !darwin !hpux
+f 0555 root sys $libdir/libfltk_gl.so.@FL_API_VERSION@ src/libfltk_gl.so.@FL_API_VERSION@ nostrip()
+%system all
+%endif
+
+
+%subpackage devel
+%description FLTK Development Environment
+%description << EOF
+Install fltk-devel if you need to develop FLTK applications. 
+You'll need to install the fltk package if you plan to run
+dynamically linked applications.
+EOF
+
 %system darwin
 f 0444 root sys $includedir/FL/mac.r FL/mac.r
 l 0444 root sys /usr/include/gcc/darwin/3.1/g++-v3/FL $includedir/FL
@ -88,57 +148,37 @@ f 0444 root sys $libdir/libfltk_gl.a lib/libfltk_gl.a
 %endif

 %if DSONAME
-%system aix
-f 0555 root sys $libdir/libfltk_s.a src/libfltk_s.a nostrip()
 %system hpux
-f 0555 root sys $libdir/libfltk.sl.@FL_API_VERSION@ src/libfltk.sl.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk.sl libfltk.sl.@FL_API_VERSION@
 %system darwin
-f 0555 root sys $libdir/libfltk.@FL_API_VERSION@.dylib src/libfltk.@FL_API_VERSION@.dylib nostrip()
 l 0000 root sys $libdir/libfltk.dylib libfltk.@FL_API_VERSION@.dylib
 %system !aix !darwin !hpux
-f 0555 root sys $libdir/libfltk.so.@FL_API_VERSION@ src/libfltk.so.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk.so libfltk.so.@FL_API_VERSION@
 %system all

-%system aix
-f 0555 root sys $libdir/libfltk_forms_s.a src/libfltk_forms_s.a nostrip()
 %system hpux
-f 0555 root sys $libdir/libfltk_forms.sl.@FL_API_VERSION@ src/libfltk_forms.sl.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_forms.sl libfltk_forms.sl.@FL_API_VERSION@
 %system darwin
-f 0555 root sys $libdir/libfltk_forms.@FL_API_VERSION@.dylib src/libfltk_forms.@FL_API_VERSION@.dylib nostrip()
 l 0000 root sys $libdir/libfltk_forms.dylib libfltk_forms.@FL_API_VERSION@.dylib
 %system !aix !darwin !hpux
-f 0555 root sys $libdir/libfltk_forms.so.@FL_API_VERSION@ src/libfltk_forms.so.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_forms.so libfltk_forms.so.@FL_API_VERSION@
 %system all

-%system aix
-f 0555 root sys $libdir/libfltk_images_s.a src/libfltk_images_s.a nostrip()
 %system hpux
-f 0555 root sys $libdir/libfltk_images.sl.@FL_API_VERSION@ src/libfltk_images.sl.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_images.sl libfltk_images.sl.@FL_API_VERSION@
 %system darwin
-f 0555 root sys $libdir/libfltk_images.@FL_API_VERSION@.dylib src/libfltk_images.@FL_API_VERSION@.dylib nostrip()
 l 0000 root sys $libdir/libfltk_images.dylib libfltk_images.@FL_API_VERSION@.dylib
 %system !aix !darwin !hpux
-f 0555 root sys $libdir/libfltk_images.so.@FL_API_VERSION@ src/libfltk_images.so.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_images.so libfltk_images.so.@FL_API_VERSION@
 %system all
 %endif

 %if GLDSONAME
-%system aix
-f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a nostrip()
 %system hpux
-f 0555 root sys $libdir/libfltk_gl.sl.@FL_API_VERSION@ src/libfltk_gl.sl.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_gl.sl libfltk_gl.sl.@FL_API_VERSION@
 %system darwin
-f 0555 root sys $libdir/libfltk_gl.@FL_API_VERSION@.dylib src/libfltk_gl.@FL_API_VERSION@.dylib nostrip()
 l 0000 root sys $libdir/libfltk_gl.dylib libfltk_gl.@FL_API_VERSION@.dylib
 %system !aix !darwin !hpux
-f 0555 root sys $libdir/libfltk_gl.so.@FL_API_VERSION@ src/libfltk_gl.so.@FL_API_VERSION@ nostrip()
 l 0000 root sys $libdir/libfltk_gl.so libfltk_gl.so.@FL_API_VERSION@
 %system all
 %endif
@ -259,11 +299,19 @@ l 0000 root sys $includedir/FL/x.h x.H
 %system all

 # Documentation
-f 0444 root sys $datadir/doc/fltk/ documentation/*.gif
-f 0444 root sys $datadir/doc/fltk/ documentation/*.html
-f 0444 root sys $datadir/doc/fltk/ documentation/*.jpg
-f 0444 root sys $datadir/doc/fltk/COPYING COPYING
-f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES
+d 0555 root sys $docdir -
+f 0444 root sys $docdir/ documentation/*.gif
+f 0444 root sys $docdir/ documentation/*.html
+f 0444 root sys $docdir/ documentation/*.jpg
+f 0444 root sys $docdir/COPYING COPYING
+f 0444 root sys $docdir/CHANGES CHANGES
+
+# Examples
+d 0555 root sys $docdir/examples
+f 0444 root sys $docdir/examples/config.h config.h
+f 0444 root sys $docdir/examples/ test/*.cxx
+f 0444 root sys $docdir/examples/ test/*.fl
+f 0444 root sys $docdir/examples/ test/*.h

 #
 # End of "$Id$".
--- a/fltk.spec
+++ b/fltk.spec
@ -47,7 +47,7 @@ GUI functionality without the bloat and supports 3D graphics via
 OpenGL(r) and its built-in GLUT emulation.

 %package devel
-Summary: FLTK - development environment
+Summary: FLTK Development Environment
 Group: Development/Libraries

 %description devel
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@ -424,7 +424,7 @@ void x_cb(Fl_Value_Input *i, void *v) {
      if (o->selected && o->is_widget()) {
        Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
 	w->resize((int)i->value(), w->y(), w->w(), w->h());
-	if (w->window()) w->window();
+	if (w->window()) w->window()->redraw();
 	if (o->is_window()) {
          ((Fl_Window *)w)->size_range(gridx, gridy, Fl::w(), Fl::h(),
                                       gridx, gridy, 0);
--- a/fluid/Makefile
+++ b/fluid/Makefile
@ -48,8 +48,6 @@ CPPFILES = \

 OBJECTS = $(CPPFILES:.cxx=.o)

-CLEAN	= core*
-
 include ../makeinclude

 all:	$(FLUID) fluid$(EXEEXT)
@ -66,8 +64,9 @@ fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
 	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r

-clean :
-	-@ $(RM) *.o fluid$(EXEEXT) fluid-shared$(EXEEXT) $(CLEAN)
+clean:
+	-$(RM) *.o core.* *~ *.bck *.bck
+	-$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT)

 depend:	$(CPPFILES)
 	makedepend -Y -I.. -f makedepend $(CPPFILES)
@ -95,6 +94,8 @@ rebuild:
 	./fluid -c about_panel.fl
 	./fluid -c alignment_panel.fl
 	./fluid -c function_panel.fl
+	./fluid -c print_panel.fl
+	./fluid -c template_panel.fl
 	./fluid -c widget_panel.fl

 #
--- a/src/Makefile
+++ b/src/Makefile
@ -178,8 +178,6 @@ IMGCPPFILES = \

 CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c

-CLEAN =	core* cmap
-
 ################################################################

 include ../makeinclude
@ -339,15 +337,16 @@ libfltk_images_s.a: $(IMGOBJECTS)
 	$(CHMOD) +x libfltk_images_s.a


-clean :
-	-@ $(RM) *.o $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \
+clean:
+	-$(RM) *.o core.* *~ *.bck *.bck
+	-$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \
 		../lib/$(LIBNAME) ../lib/$(FLLIBNAME) ../lib/$(GLLIBNAME) \
 		../lib/$(IMGLIBNAME) \
 		libfltk.so libfltk_forms.so libfltk_gl.so libfltk_images.so \
 		libfltk.sl libfltk_forms.sl libfltk_gl.sl libfltk_images.sl \
 		libfltk.dylib libfltk_forms.dylib \
 		libfltk_gl.dylib libfltk_images.dylib \
-		$(CLEAN)
+		cmap core

 depend:	$(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES)
 	makedepend -Y -I.. -f makedepend $(CPPFILES) $(FLCPPFILES) \
--- a/test/CubeMain.cxx
+++ b/test/CubeMain.cxx
@ -23,7 +23,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #include <FL/Fl.H>
 #include "CubeViewUI.h"

--- a/test/Makefile
+++ b/test/Makefile
@ -167,14 +167,18 @@ depend:	$(CPPFILES)
 include makedepend

 clean:
-	-@ rm -f $(ALL) $(GLALL) *.o core *~
+	-$(RM) $(ALL) $(GLALL) core
+	-$(RM) *.o core.* *~ *.bck *.bak

 install:
-	@echo Nothing to install in test directory.
+	echo "Installing example programs to $(DESTDIR)$(docdir)/examples..."
+	-$(MKDIR) $(DESTDIR)$(docdir)/examples
+	$(CP) *.h *.cxx *.fl $(DESTDIR)$(docdir)/examples
+	$(CHMOD) 644 $(DESTDIR)$(docdir)/examples/*.*

 uninstall:
-	@echo Nothing to uninstall in test directory.
-
+	echo "Removing examples programs from $(DESTDIR)$(docdir)/examples..."
+	-$(RMDIR) $(DESTDIR)$(docdir)/examples

 # FLUID file rules
 .fl.cxx .fl.h:	../fluid/fluid$(EXEEXT)
--- a/test/checkers.cxx
+++ b/test/checkers.cxx
@ -56,7 +56,7 @@ const char* copyright =
 #define FLTK
 //#define VT100

-#include "../src/flstring.h"
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
--- a/test/cube.cxx
+++ b/test/cube.cxx
@ -25,7 +25,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Box.H>
--- a/test/file_chooser.cxx
+++ b/test/file_chooser.cxx
@ -44,7 +44,7 @@
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_PNM_Image.H>
 #include <FL/Fl_Light_Button.H>
-#include "../src/flstring.h"
+#include <string.h>


 //
@ -220,12 +220,12 @@ pdf_check(const char *name,	// I - Name of file
    return 0;

  home = getenv("HOME");
-  snprintf(preview, sizeof(preview), "%s/.preview.ppm", home ? home : "");
+  sprintf(preview, "%s/.preview.ppm", home ? home : "");

-  snprintf(command, sizeof(command),
-           "gs -r100 -dFIXED -sDEVICE=ppmraw -dQUIET -dNOPAUSE -dBATCH "
-	   "-sstdout=\"%%stderr\" -sOUTPUTFILE=\'%s\' "
-	   "-dFirstPage=1 -dLastPage=1 \'%s\' 2>/dev/null", preview, name);
+  sprintf(command,
+          "gs -r100 -dFIXED -sDEVICE=ppmraw -dQUIET -dNOPAUSE -dBATCH "
+	  "-sstdout=\"%%stderr\" -sOUTPUTFILE=\'%s\' "
+	  "-dFirstPage=1 -dLastPage=1 \'%s\' 2>/dev/null", preview, name);

  if (system(command)) return 0;

@ -256,11 +256,11 @@ ps_check(const char *name,	// I - Name of file
    return 0;

  home = getenv("HOME");
-  snprintf(preview, sizeof(preview), "%s/.preview.ppm", home ? home : "");
+  sprintf(preview, "%s/.preview.ppm", home ? home : "");

  if (memcmp(header, "%!PS", 4) == 0) {
    // PS file has DSC comments; extract the first page...
-    snprintf(outname, sizeof(outname), "%s/.preview.ps", home ? home : "");
+    sprintf(outname, "%s/.preview.ps", home ? home : "");

    if (strcmp(name, outname) != 0) {
      in   = fopen(name, "rb");
@ -281,13 +281,14 @@ ps_check(const char *name,	// I - Name of file
    }
  } else {
    // PS file doesn't have DSC comments; do the whole file...
-    strlcpy(outname, name, sizeof(outname));
+    strncpy(outname, name, sizeof(outname) - 1);
+    outname[sizeof(outname) - 1] = '\0';
  }

-  snprintf(command, sizeof(command),
-           "gs -r100 -dFIXED -sDEVICE=ppmraw -dQUIET -dNOPAUSE -dBATCH "
-	   "-sstdout=\"%%stderr\" -sOUTPUTFILE=\'%s\' \'%s\' 2>/dev/null",
-	   preview, outname);
+  sprintf(command,
+          "gs -r100 -dFIXED -sDEVICE=ppmraw -dQUIET -dNOPAUSE -dBATCH "
+	  "-sstdout=\"%%stderr\" -sOUTPUTFILE=\'%s\' \'%s\' 2>/dev/null",
+	  preview, outname);

  if (system(command)) return 0;

--- a/test/fractals.cxx
+++ b/test/fractals.cxx
@ -27,7 +27,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #if !HAVE_GL || !HAVE_GL_GLU_H
 #include <FL/Fl.H>
 #include <FL/fl_message.H>
--- a/test/fullscreen.cxx
+++ b/test/fullscreen.cxx
@ -54,7 +54,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Single_Window.H>
 #include <FL/Fl_Hor_Slider.H>
--- a/test/gl_overlay.cxx
+++ b/test/gl_overlay.cxx
@ -23,7 +23,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Hor_Slider.H>
--- a/test/glpuzzle.cxx
+++ b/test/glpuzzle.cxx
@ -27,7 +27,7 @@
 //

 // this block added for fltk's distribtion so it will compile w/o OpenGL:
-#include <config.h>
+#include "config.h"
 #if !HAVE_GL || !HAVE_GL_GLU_H
 #include <FL/Fl.H>
 #include <FL/fl_message.H>
--- a/test/list_visuals.cxx
+++ b/test/list_visuals.cxx
@ -42,7 +42,7 @@ int main(int, char**) {

 #else

-#include <config.h>
+#include "config.h"

 #ifndef Fl_H

--- a/test/makedepend
+++ b/test/makedepend
@ -34,15 +34,14 @@ buttons.o: ../FL/Fl_Button.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H
 buttons.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
 buttons.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H ../FL/Fl_Tooltip.H
 buttons.o: ../FL/Fl_Widget.H
-checkers.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H
-checkers.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H
-checkers.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-checkers.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_draw.H
-checkers.o: ../FL/Fl_Menu_Item.H ../FL/fl_ask.H black_1.xbm black_2.xbm
-checkers.o: black_3.xbm black_4.xbm white_1.xbm white_2.xbm white_3.xbm
-checkers.o: white_4.xbm blackking_1.xbm blackking_2.xbm blackking_3.xbm
-checkers.o: blackking_4.xbm whiteking_1.xbm whiteking_2.xbm whiteking_3.xbm
-checkers.o: whiteking_4.xbm ../FL/Fl_Box.H ../FL/Fl_Slider.H
+checkers.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+checkers.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+checkers.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
+checkers.o: ../FL/fl_draw.H ../FL/Fl_Menu_Item.H ../FL/fl_ask.H black_1.xbm
+checkers.o: black_2.xbm black_3.xbm black_4.xbm white_1.xbm white_2.xbm
+checkers.o: white_3.xbm white_4.xbm blackking_1.xbm blackking_2.xbm
+checkers.o: blackking_3.xbm blackking_4.xbm whiteking_1.xbm whiteking_2.xbm
+checkers.o: whiteking_3.xbm whiteking_4.xbm ../FL/Fl_Box.H ../FL/Fl_Slider.H
 checkers.o: ../FL/Fl_Valuator.H ../FL/Fl_Value_Output.H
 clock.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 clock.o: ../FL/Fl_Clock.H ../FL/Fl_Widget.H ../FL/Fl_Round_Clock.H
@ -139,8 +138,7 @@ file_chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 file_chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 file_chooser.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/Fl_File_Icon.H
 file_chooser.o: ../FL/Fl_Shared_Image.H ../FL/Fl_PNM_Image.H
-file_chooser.o: ../FL/Fl_Light_Button.H ../src/flstring.h ../FL/Fl_Export.H
-file_chooser.o: ../config.h
+file_chooser.o: ../FL/Fl_Light_Button.H
 fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 fonts.o: ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
 fonts.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H
@ -191,7 +189,7 @@ help.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 help.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Help_View.H ../FL/Fl.H
 help.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 help.o: ../FL/fl_draw.H ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H
-help.o: ../FL/Fl_Button.H ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+help.o: ../FL/Fl_Group.H ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 iconize.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 iconize.o: ../FL/Fl_Window.H ../FL/Fl_Button.H ../FL/Fl_Box.H
 image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
--- a/test/shape.cxx
+++ b/test/shape.cxx
@ -23,7 +23,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Hor_Slider.H>
--- a/test/threads.cxx
+++ b/test/threads.cxx
@ -23,7 +23,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //

-#include <config.h>
+#include "config.h"

 #if HAVE_PTHREAD || defined(WIN32)
 #  include <FL/Fl.H>