Doco and dist file updates.

Add fltk-config man page.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1911 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

FL/Makefile.in

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile.in,v 1.1.2.3 2002/01/01 15:11:28 easysw Exp $"
+# "$Id: Makefile.in,v 1.1.2.4 2002/01/06 13:40:31 easysw Exp $"
 #
 # Header makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -32,7 +32,9 @@ install:
 	-mkdir -p $(includedir)
 	rm -rf $(includedir)/FL
 	mkdir $(includedir)/FL
+	chmod 755 $(includedir)/FL
 	cp ../FL/*.[hHr] $(includedir)/FL
+	chmod 644 $(includedir)/FL/*.[hHr]
 @HLINKS@	cd $(includedir)/FL;\
 @HLINKS@	for file in *.H; do\
 @HLINKS@		rm -f "`basename $$file H`h";\
@@ -52,5 +54,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile.in,v 1.1.2.3 2002/01/01 15:11:28 easysw Exp $".
+# End of "$Id: Makefile.in,v 1.1.2.4 2002/01/06 13:40:31 easysw Exp $".
 #

Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.12.2.6.2.9 2002/01/01 15:11:27 easysw Exp $"
+# "$Id: Makefile,v 1.12.2.6.2.10 2002/01/06 13:40:27 easysw Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -26,7 +26,7 @@
 include makeinclude
 
 SHELL	=	/bin/sh
-DIRS	=	src fluid test
+DIRS	=	src fluid test documentation
 
 all: makeinclude
 	@for dir in $(DIRS); do\
@@ -35,17 +35,17 @@ all: makeinclude
 	done
 
 install: makeinclude
-	@for dir in FL $(DIRS) documentation; do\
+	@for dir in FL $(DIRS); do\
 		echo "=== installing $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
 	done
 	-mkdir -p $(bindir)
 	rm -f $(bindir)/fltk-config
 	-cp fltk-config $(bindir)
-	-chmod +x $(bindir)/fltk-config
+	-chmod 755 $(bindir)/fltk-config
 
 uninstall: makeinclude
-	@for dir in FL $(DIRS) documentation; do\
+	@for dir in FL $(DIRS); do\
 		echo "=== uninstalling $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
 	done
@@ -74,10 +74,18 @@ makeinclude: configure configh.in makeinclude.in
 	else \
 		./configure; \
 	fi
+	touch config.h
 
 configure: configure.in
 	autoconf
 
+portable-dist:
+	epm -v fltk
+
+native-dist:
+	epm -v -f native fltk
+
+
 #
-# End of "$Id: Makefile,v 1.12.2.6.2.9 2002/01/01 15:11:27 easysw Exp $".
+# End of "$Id: Makefile,v 1.12.2.6.2.10 2002/01/06 13:40:27 easysw Exp $".
 #

configure.in

@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.45 2002/01/01 15:11:27 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.46 2002/01/06 13:40:27 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -368,6 +368,7 @@ case $uname in
 	GLLIB=
 
 	if test x$enable_gl != xno; then
+	    AC_SEARCH_LIBS(dlopen, dl)
 	    AC_CHECK_HEADER(GL/gl.h,
 		AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \
 		    AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGL",,\
@@ -633,5 +634,5 @@ AC_OUTPUT(makeinclude fltk.list fltk-config FL/Makefile)
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.45 2002/01/01 15:11:27 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.46 2002/01/06 13:40:27 easysw Exp $".
 dnl

documentation/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9.2.10.2.7 2002/01/01 15:11:28 easysw Exp $"
+# "$Id: Makefile,v 1.9.2.10.2.8 2002/01/06 13:40:32 easysw Exp $"
 #
 # Documentation makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -139,7 +139,7 @@ HTMLFILES	= \
 			subclassing.html \
 			widgets.html
 
-MANPAGES =	fltk.$(CAT3EXT) fluid.$(CAT1EXT)
+MANPAGES =	fltk.$(CAT3EXT) fltk-config.$(CAT1EXT) fluid.$(CAT1EXT)
 
 all:	fltk.ps fltk.pdf $(MANPAGES)
 
@@ -165,12 +165,16 @@ install: $(MANPAGES)
 	-mkdir -p $(mandir)/cat1
 	cp fluid.$(CAT1EXT) $(mandir)/cat1
 	chmod 644 $(mandir)/cat1/fluid.$(CAT1EXT)
+	cp fltk-config.$(CAT1EXT) $(mandir)/cat1
+	chmod 644 $(mandir)/cat1/fltk-config.$(CAT1EXT)
 	-mkdir -p $(mandir)/cat3
 	cp fltk.$(CAT3EXT) $(mandir)/cat3
 	chmod 644 $(mandir)/cat3/fltk.$(CAT3EXT)
 	-mkdir -p $(mandir)/man1
 	cp fluid.man $(mandir)/man1/fluid.1
 	chmod 644 $(mandir)/man1/fluid.1
+	cp fltk-config.man $(mandir)/man1/fltk-config.1
+	chmod 644 $(mandir)/man1/fltk-config.1
 	-mkdir -p $(mandir)/man3
 	cp fltk.man $(mandir)/man3/fltk.3
 	chmod 644 $(mandir)/man3/fltk.3
@@ -203,5 +207,5 @@ fltk.pdf: $(HTMLFILES)
 	$(HTMLDOC) --verbose --batch fltk.book -f fltk.pdf
 
 #
-# End of "$Id: Makefile,v 1.9.2.10.2.7 2002/01/01 15:11:28 easysw Exp $".
+# End of "$Id: Makefile,v 1.9.2.10.2.8 2002/01/06 13:40:32 easysw Exp $".
 #

documentation/fltk-config.man

@@ -0,0 +1,83 @@
+.TH fltk-config 1 "Fast Light Tool Kit" "6 January 2002"
+.SH NAME
+fltk-config \- script to get information about the installed version of fltk.
+.sp
+.SH SYNOPSIS
+fltk-config [ --prefix
+.I [=DIR]
+] [ --exec-prefix
+.I [=DIR]
+] [ --version ] [ --api-version ] [ --use-gl ] [ --use-images ] [ --use-glut ]
+[ --cflags ] [ --cxxflags ] [ --ldflags ] [ --ldstaticflags ] [ --libs ]
+[ --compile
+.I program.cxx
+] [ --post
+.I program
+]
+.SH DESCRIPTION
+\fIfltk-config\fR is a utility script that can be used to get information
+about the current version of FLTK that is installed on the system, what
+compiler and linker options to use when building FLTK-based applications,
+and to build simple FLTK applications.
+.LP
+The following options are supported:
+.TP 5
+--api-version
+.br
+Displays the current FLTK API version number, e.g. "1.1".
+.TP 5
+--cflags
+.TP 5
+--cxxflags
+.br
+Displays the C/C++ compiler options to use when compiling source
+files that use FLTK.
+.TP 5
+--compile \fIprogram.cxx\fR
+.br
+Compiles the source file \fIprogram.cxx\fR into \fIprogram\fR.
+This option implies "--post \fIprogram\fR".
+.TP 5
+--ldflags
+.br
+Displays the linker options to use when linking a FLTK
+application.
+.TP 5
+--ldstaticflags
+.br
+Displays the linker options to use when linking a FLTK
+application to the static FLTK libraries.
+.TP 5
+--libs
+.br
+Displays the full path to the FLTK library files, to be used for
+dependency checking.
+.TP 5
+--post \fIprogram\fR
+.br
+Binds the default FLTK resource fork to a program under MacOS.
+Does nothing on other operating systems.
+.TP 5
+--use-gl
+.br
+Enables OpenGL support.
+.TP 5
+--use-glut
+.br
+Enables GLUT support.
+.TP 5
+--use-images
+.br
+Enables image file support.
+.TP 5
+--version
+.br
+Displays the current FLTK version number, e.g. "1.1.0".
+.SH SEE ALSO
+fluid(1), fltk(3)
+.br
+FLTK Programming Manual
+.br
+FLTK Web Site, http://www.fltk.org/
+.SH AUTHORS
+Bill Spitzak and others.

documentation/fltk.book

@@ -8,8 +8,8 @@ editor.html
 drawing.html
 events.html
 subclassing.html
-fluid.html
 opengl.html
+fluid.html
 widgets.html
 Fl.html
 Fl_Adjuster.html

documentation/fltk.man

@@ -1,22 +1,55 @@
-.TH fltk 1 "Fast Light Tool Kit" "27 January 2001"
+.TH fltk 3 "Fast Light Tool Kit" "6 January 2002"
 .SH NAME
-fltk \- the fast light Tool Kit
+fltk \- the fast light tool kit
 .sp
 .SH SYNOPSIS
-
+The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
-The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a LGPL'd
+C++ graphical user interface toolkit for the X Window
-C++ graphical user interface toolkit for X (UNIX(R)), OpenGL(R), and
+System, MacOS(r), and Microsoft Windows(r) that supports OpenGL(r).
-Microsoft(R) Windows(R) NT 4.0, 95, or 98. It was originally developed
+It was originally developed by Mr. Bill Spitzak and is currently
-by Mr. Bill Spitzak and is currently maintained by a small group of
+maintained by a small group of developers across the world with
-developers across the world with a central repository in the US.
+a central repository in the US.
-
+.LP
+FLTK is provides under the terms of the GNU Library General Public License,
+with the following exceptions:
+.IP
+1. Modifications to the FLTK configure script, config header
+file, and makefiles by themselves to support a specific platform
+do not constitute a modified or derivative work.
+.IP
+The authors do request that such modifications be
+contributed to the FLTK project - send all
+contributions to "fltk-bugs@fltk.org".
+.IP
+2. Widgets that are subclassed from FLTK widgets do not
+constitute a derivative work.
+.IP
+3. Static linking of applications and widgets to the FLTK
+library does not constitute a derivative work and does not
+require the author to provide source code for the application or
+widget, use the shared FLTK libraries, or link their
+applications or widgets against a user-supplied version of FLTK.
+.IP
+If you link the application or widget to a modified version of
+FLTK, then the changes to FLTK must be provided under the terms
+of the LGPL in sections 1, 2, and 4.
+.IP
+4. You do not have to provide a copy of the FLTK license with
+programs that are linked to the FLTK library, nor do you have to
+identify the FLTK license in your program or documentation as
+required by section 6 of the LGPL.
+.IP
+However, programs must still identify their use of FLTK. The
+following example statement can be included in user
+documentation to satisfy this requirement:
+.IP
+[program/widget] is based in part on the work of the FLTK
+project (http://www.fltk.org).
 .SH SEE ALSO
-.nf
+fltk-config(1), fluid(1)
+.br
 FLTK Programming Manual
-file:/usr/local/share/doc/fltk/index.html
+.br
-.PP
+FLTK Web Site, http://www.fltk.org/
-http://www.fltk.org
+.SH AUTHORS
-.PP
-.BR fluid (1)
-.SH AUTHOR
 Bill Spitzak and others.

documentation/fluid.html

@@ -1,5 +1,5 @@
 <HTML><BODY>
-<H1 ALIGN=RIGHT><A NAME=FLUID>8 - Programming with FLUID</A></H1>
+<H1 ALIGN=RIGHT><A NAME=FLUID>9 - Programming with FLUID</A></H1>
 
 This chapter shows how to use the Fast Light User-Interface Designer
 (&quot;FLUID&quot;) to create your GUIs.

documentation/fluid.man

@@ -1,27 +1,32 @@
-.TH fluid 1 "Fast Light Tool Kit" "27 January 2001"
+.TH fluid 1 "Fast Light Tool Kit" "6 January 2002"
 .SH NAME
 fluid \- the fast light user-interface designer
 .sp
 .SH SYNOPSIS
-.nf
+fluid [ -c [ -o
-fluid \fI[-c [-o code-filename -h header-filename]] [filename.fl]\fR 
+.I code-filename
+-h
+.I header-filename
+] ] [
+.I filename.fl
+] 
 .fi
 .SH DESCRIPTION
-\fIfluid\fR is an interactive GUI designer for FLTK. When run with no arguments
+\fIfluid\fR is an interactive GUI designer for FLTK. When run
-or with a filename, \fIfluid\fR will display the GUI hierarchy and any windows
+with no arguments or with a filename, \fIfluid\fR will display
-defined in the file. Functions, classes, windows, and GUI components can be
+the GUI hierarchy and any windows defined in the file.
+Functions, classes, windows, and GUI components can be
 manipulated as needed.
 .LP
-When used with the \fI-c\fR option, \fIfluid\fR will create the necessary C++
+When used with the \fI-c\fR option, \fIfluid\fR will create the
-header and code files in the current directory.  You can override the default
+necessary C++ header and code files in the current directory. 
-extensions, filenames, and directories using the \fI-o\fR and \fI-h\fR options.
+You can override the default extensions, filenames, and
+directories using the \fI-o\fR and \fI-h\fR options.
 .SH SEE ALSO
-.nf
+fltk-config(1), fltk(3)
-FLTK Programming Manual, chapter 8.
+.br
-file:/usr/local/share/doc/fltk/fluid.html
+FLTK Programming Manual, Chapter 9
-.PP
+.br
-http://www.fltk.org
+FLTK Web Site, http://www.fltk.org/
-.PP
+.SH AUTHORS
-.BR fltk (3)
-.SH AUTHOR
 Bill Spitzak and others.

fltk.list.in

@@ -1,5 +1,5 @@
 #
-# "$Id: fltk.list.in,v 1.1.2.2 2002/01/01 15:11:27 easysw Exp $"
+# "$Id: fltk.list.in,v 1.1.2.3 2002/01/06 13:40:28 easysw Exp $"
 #
 # EPM product list file for the Fast Light Tool Kit (FLTK).
 #
@@ -44,39 +44,57 @@ $mandir=@mandir@
 $CAT1EXT=@CAT1EXT@
 $CAT3EXT=@CAT3EXT@
 
+$DSONAME=@DSONAME@
+$GLDSONAME=@GLDSONAME@
+$GLLIBNAME=@GLLIBNAME@
+
 # FLUID
 f 0555 root sys $bindir/fluid fluid/fluid
 f 0555 root sys $bindir/fltk-config fltk-config
 
 # Man pages
-f 0444 root sys $mandir/cat1/fluid.$CAT1EXT documentation/fluid.$CAT3EXT
+f 0444 root sys $mandir/cat1/fluid.$CAT1EXT documentation/fluid.$CAT1EXT
+f 0444 root sys $mandir/cat1/fltk-config.$CAT1EXT documentation/fltk-config.$CAT1EXT
 f 0444 root sys $mandir/cat3/fltk.$CAT3EXT documentation/fltk.$CAT3EXT
 f 0444 root sys $mandir/man1/fluid.1 documentation/fluid.man
+f 0444 root sys $mandir/man1/fltk-config.1 documentation/fltk-config.man
 f 0444 root sys $mandir/man3/fltk.3 documentation/fltk.man
 
 # Library files
 f 0444 root sys $libdir/libfltk.a lib/libfltk.a
+%if GLLIBNAME
 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
-f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a
 %system hpux
 f 0555 root sys $libdir/libfltk.sl.@FL_API_VERSION@ src/libfltk.sl.@FL_API_VERSION@
 l 0000 root sys $libdir/libfltk.sl libfltk.sl.@FL_API_VERSION@
-f 0555 root sys $libdir/libfltk_gl.sl.@FL_API_VERSION@ src/libfltk_gl.sl.@FL_API_VERSION@
-l 0000 root sys $libdir/libfltk_gl.sl libfltk_gl.sl.@FL_API_VERSION@
 %system darwin freebsd openbsd netbsd
 f 0555 root sys $libdir/libfltk.dylib.@FL_API_VERSION@ src/libfltk.dylib.@FL_API_VERSION@
 l 0000 root sys $libdir/libfltk.dylib libfltk.dylib.@FL_API_VERSION@
-f 0555 root sys $libdir/libfltk_gl.dylib.@FL_API_VERSION@ src/libfltk_gl.dylib.@FL_API_VERSION@
-l 0000 root sys $libdir/libfltk_gl.dylib libfltk_gl.dylib.@FL_API_VERSION@
 %system !aix !darwin !freebsd !openbsd !netbsd !hpux
 f 0555 root sys $libdir/libfltk.so.@FL_API_VERSION@ src/libfltk.so.@FL_API_VERSION@
 l 0000 root sys $libdir/libfltk.so libfltk.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
+%system hpux
+f 0555 root sys $libdir/libfltk_gl.sl.@FL_API_VERSION@ src/libfltk_gl.sl.@FL_API_VERSION@
+l 0000 root sys $libdir/libfltk_gl.sl libfltk_gl.sl.@FL_API_VERSION@
+%system darwin freebsd openbsd netbsd
+f 0555 root sys $libdir/libfltk_gl.dylib.@FL_API_VERSION@ src/libfltk_gl.dylib.@FL_API_VERSION@
+l 0000 root sys $libdir/libfltk_gl.dylib libfltk_gl.dylib.@FL_API_VERSION@
+%system !aix !darwin !freebsd !openbsd !netbsd !hpux
 f 0555 root sys $libdir/libfltk_gl.so.@FL_API_VERSION@ src/libfltk_gl.so.@FL_API_VERSION@
 l 0000 root sys $libdir/libfltk_gl.so libfltk_gl.so.@FL_API_VERSION@
 %system all
+%endif
 
 # Header files
 f 0444 root sys $includedir/FL/ FL/*.[hH]
@@ -198,5 +216,5 @@ f 0444 root sys $datadir/doc/fltk/COPYING COPYING
 f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES
 
 #
-# End of "$Id: fltk.list.in,v 1.1.2.2 2002/01/01 15:11:27 easysw Exp $".
+# End of "$Id: fltk.list.in,v 1.1.2.3 2002/01/06 13:40:28 easysw Exp $".
 #

fluid/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.9 2002/01/01 15:11:29 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.10 2002/01/06 13:40:32 easysw Exp $"
 #
 # FLUID makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -69,7 +69,7 @@ install: $(PROGRAM)
 	echo "Installing FLUID..."
 	strip $(PROGRAM)
 	-mkdir -p $(bindir)
-	cp $(PROGRAM) $(bindir)/$(PROGRAM)
+	cp $(PROGRAM) $(bindir)
 	chmod 755 $(bindir)/$(PROGRAM)
 
 uninstall:
@@ -87,5 +87,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.9 2002/01/01 15:11:29 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.10 2002/01/06 13:40:32 easysw Exp $".
 #

src/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.28 2002/01/01 15:11:31 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.29 2002/01/06 13:40:32 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -290,30 +290,36 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
 		rm -f $(libdir)/libfltk.so*;\
 		cp libfltk.so.1.1 $(libdir); \
+		chmod 755 $(libdir)/libfltk.so.1.1; \
 		ln -s libfltk.so.1.1 $(libdir)/libfltk.so;\
 	fi
 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
 		rm -f $(libdir)/libfltk.sl*;\
 		cp libfltk.sl.1.1 $(libdir); \
+		chmod 755 $(libdir)/libfltk.sl.1.1; \
 		ln -s libfltk.sl.1.1 $(libdir)/libfltk.sl;\
 	fi
 	if test x$(DSONAME) = xlibfltk_s.a; then\
 		rm -f $(libdir)/libfltk_s.a;\
 		cp libfltk_s.a $(libdir); \
+		chmod 755 $(libdir)/libfltk_s.a; \
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
 		rm -f $(libdir)/libfltk_gl.so*;\
 		cp libfltk_gl.so.1.1 $(libdir); \
+		chmod 755 $(libdir)/libfltk_gl.so.1.1; \
 		ln -s libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
 		rm -f $(libdir)/libfltk_gl.sl*;\
 		cp libfltk_gl.sl.1.1 $(libdir); \
+		chmod 755 $(libdir)/libfltk_gl.sl.1.1; \
 		ln -s libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
 		rm -f $(libdir)/libfltk_gl_s.a;\
 		cp libfltk_gl_s.a $(libdir); \
+		chmod 755 $(libdir)/libfltk_gl.a; \
 	fi
 
 
@@ -344,5 +350,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.28 2002/01/01 15:11:31 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.29 2002/01/06 13:40:32 easysw Exp $".
 #