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

1 files changed, 74 insertions, 26 deletions

diff --git a/fltk.list.in b/fltk.list.in
index efac51e33..7e6dfe878 100644
--- 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$".