diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | configure.in | 102 | ||||
| -rw-r--r-- | fltk.list | 276 | ||||
| -rw-r--r-- | fltk.spec | 21 | ||||
| -rw-r--r-- | fluid/Makefile | 6 | ||||
| -rw-r--r-- | makeinclude.in | 10 | ||||
| -rw-r--r-- | src/Makefile | 85 | ||||
| -rw-r--r-- | test/Makefile | 42 |
9 files changed, 206 insertions, 346 deletions
@@ -27,7 +27,7 @@ TODO - Added 2.0 Fl_Text_Display and Fl_Text_Editor widgets TODO - The Fl_Choice widget now looks more line a combo box than a Motif option menu. -TODO - Moved the OpenGL widgets into a separate library + - Moved the OpenGL widgets into a separate library called fltkgl - this eliminates shared library dependencies on OpenGL when no OpenGL functionality is used/required. @@ -43,7 +43,7 @@ TODO - FLUID now supports the new Fl_CheckBrowser, TODO - Documentation updates. -TODO - Updated configure stuff to support shared libraries + - Updated configure stuff to support shared libraries under AIX (link to -lfltk_s) TODO - Symbol labels can now contain regular text and @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.12.2.6.2.2 2001/08/02 15:31:59 easysw Exp $" +# "$Id: Makefile,v 1.12.2.6.2.3 2001/08/02 18:08:36 easysw Exp $" # # Top-level makefile for the Fast Light Tool Kit (FLTK). # @@ -57,7 +57,7 @@ distclean: clean makeinclude: configure configh.in makeinclude.in if test -f config.status; then \ - ./config.status --recheck; \ + ./config.status; \ else \ ./configure; \ fi @@ -66,5 +66,5 @@ configure: configure.in autoconf # -# End of "$Id: Makefile,v 1.12.2.6.2.2 2001/08/02 15:31:59 easysw Exp $". +# End of "$Id: Makefile,v 1.12.2.6.2.3 2001/08/02 18:08:36 easysw Exp $". # diff --git a/configure.in b/configure.in index 87861f8d4..7e829bfdb 100644 --- a/configure.in +++ b/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 2001/05/07 14:34:22 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.1 2001/08/02 18:08:36 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -29,7 +29,11 @@ AC_INIT(src/Fl.cxx) AC_PROG_RANLIB -LIBNAME="libfltk.a" +LINKFLTK="-lfltk" +LINKFLTKGL="-lfltkgl" + +LIBNAME="../lib/libfltk.a" +GLLIBNAME="../lib/libfltkgl.a" if test "$RANLIB" != ":"; then LIBCOMMAND="ar cr" else @@ -55,46 +59,41 @@ CFLAGS="${CFLAGS:=}" CXXFLAGS="${CXXFLAGS:=}" AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then - DEBUGFLAG="-g " + DEBUGFLAG="-g " fi]) AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes]]) AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[ if eval "test x$enable_shared = xyes"; then - PICFLAG=1 - case $uname in - SunOS* | UNIX_S*) - DSONAME="libfltk.so.1" - DSOCOMMAND="\$(CXX) -h libfltk.so.1 \$(LDLIBS) -G $DEBUGFLAG -o" - ;; - HP-UX*) - DSONAME="libfltk.sl.1" - DSOCOMMAND="ld -b -z +h libfltk.sl.1 $DEBUGFLAG -o" - ;; - OSF1*) - DSONAME="libfltk.so.1" - DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o" - ;; - IRIX*) - DSONAME="libfltk.so.1" - DSOCOMMAND="\$(CXX) -soname libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o" - ;; - FreeBSD* | NetBSD* | OpenBSD*) - DSONAME="libfltk.so.1" - DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared \$(OPTIM) -o" - ;; - AIX*) - PICFLAG=0 - - echo "Warning: shared libraries are not currently supported under AIX." - echo " Building static libraries." - ;; - *) - echo "Warning: shared libraries may not be supported. Trying -shared" - echo " option with compiler." - DSONAME="libfltk.so.1" - DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o" - ;; - esac + PICFLAG=1 + case $uname in + SunOS* | UNIX_S*) + DSONAME="libfltk.so.1.1" + GLDSONAME="libfltkgl.so.1.1" + DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" + ;; + HP-UX*) + DSONAME="libfltk.sl.1.1" + GLDSONAME="libfltkgl.sl.1.1" + DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o" + ;; + IRIX* | OSF1* | FreeBSD* | NetBSD* | OpenBSD*) + DSONAME="libfltk.so.1.1" + GLDSONAME="libfltkgl.so.1.1" + DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" + ;; + AIX*) + DSONAME="libfltk_s.a" + GLDSONAME="libfltkgl_s.a" + DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o" + ;; + *) + echo "Warning: shared libraries may not be supported. Trying -shared" + echo " option with compiler." + DSONAME="libfltk.so.1.1" + GLDSONAME="libfltkgl.so.1.1" + DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" + ;; + esac fi]) AC_PROG_CC @@ -193,6 +192,16 @@ if test x$enable_gl != xno; then GLLIB="-lMesaGLU $GLLIB" fi ) + + if test x$ac_cv_lib_GL_glXMakeCurrent = xno; then + LINKFLTKGL="" + GLLIBNAME="" + GLDSONAME="" + fi +else + LINKFLTKGL="" + GLLIBNAME="" + GLDSONAME="" fi AC_SUBST(GLLIB) @@ -261,7 +270,8 @@ MAKEDEPEND="\$(CXX) -M" if test -n "$GXX"; then # Use gcc instead of c++ or g++, since we don't need the C++ - # library to depend on... + # library to depend on... Note that this doesn't work with + # GCC 3.0, but then again not much *does* work with GCC 3.0... CXX="$CC" CFLAGS="-Wall $CFLAGS" CXXFLAGS="-Wall $CXXFLAGS" @@ -357,6 +367,9 @@ else CFLAGS="-O2 $CFLAGS" CXXFLAGS="-O2 $CXXFLAGS" fi + echo "WARNING: The AIX C and C++ compilers are known not to correctly" + echo " compile the FLTK library. We recommend using GCC 2.95.2" + echo " under AIX." ;; *) # Running some other operating system; inform the user they @@ -372,14 +385,19 @@ fi CFLAGS="$DEBUGFLAG $CFLAGS" CXXFLAGS="$DEBUGFLAG $CXXFLAGS" -AC_SUBST(DSONAME) AC_SUBST(DSOCOMMAND) -AC_SUBST(LIBNAME) +AC_SUBST(DSONAME) +AC_SUBST(GLDSONAME) +AC_SUBST(GLLIBNAME) AC_SUBST(LIBCOMMAND) +AC_SUBST(LIBNAME) +AC_SUBST(LINKFLTKGL) +AC_SUBST(LINKFLTK) AC_SUBST(MAKEDEPEND) + AC_CONFIG_HEADER(config.h:configh.in) AC_OUTPUT(makeinclude) dnl -dnl End of "$Id: configure.in,v 1.33.2.31 2001/05/07 14:34:22 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.1 2001/08/02 18:08:36 easysw Exp $". dnl @@ -1,5 +1,5 @@ # -# "$Id: fltk.list,v 1.1.2.6 2001/05/07 14:51:10 easysw Exp $" +# "$Id: fltk.list,v 1.1.2.6.2.1 2001/08/02 18:08:36 easysw Exp $" # # EPM product list file for the Fast Light Tool Kit (FLTK). # @@ -30,7 +30,7 @@ %vendor LGPL %license COPYING %readme README -%version 1.0.11 +%version 1.1.0 %description FLTK is a cross-platform GUI toolkit for C++. # FLUID @@ -38,7 +38,7 @@ f 0555 root sys /usr/bin/fluid fluid/fluid # Man pages %system irix -f 0444 root sys /usr/catman/u_man/cat1/fluid.z documentation/fluid.z +f 0444 root sys /usr/catman/p_man/cat1/fluid.z documentation/fluid.z f 0444 root sys /usr/catman/p_man/cat3/fltk.z documentation/fltk.z %system !irix f 0444 root sys /usr/man/man1/fluid.1 documentation/fluid.man @@ -48,340 +48,140 @@ f 0444 root sys /usr/man/man3/fltk.3 documentation/fltk.man # Library files %system irix-6.5 f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a -f 0555 root sys /usr/lib32/libfltk.so.1 src/libfltk.so.1 -l 0000 root sys /usr/lib32/libfltk.so libfltk.so.1 +f 0555 root sys /usr/lib32/libfltk.so.1.1 src/libfltk.so.1.1 +l 0000 root sys /usr/lib32/libfltk.so libfltk.so.1.1 +f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a +f 0555 root sys /usr/lib32/libfltkgl.so.1.1 src/libfltkgl.so.1.1 +l 0000 root sys /usr/lib32/libfltkgl.so libfltkgl.so.1.1 %system hpux f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a -f 0555 root sys /usr/lib32/libfltk.sl.1 src/libfltk.sl.1 -l 0000 root sys /usr/lib32/libfltk.sl libfltk.sl.1 -%system !irix-6.5 !hpux +f 0555 root sys /usr/lib32/libfltk.sl.1.1 src/libfltk.sl.1.1 +l 0000 root sys /usr/lib32/libfltk.sl libfltk.sl.1.1 +f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a +f 0555 root sys /usr/lib32/libfltkgl.sl.1.1 src/libfltkgl.sl.1.1 +l 0000 root sys /usr/lib32/libfltkgl.sl libfltkgl.sl.1.1 +%system aix +f 0444 root sys /usr/lib32/libfltk.a lib/libfltk.a +f 0555 root sys /usr/lib32/libfltk_s.a src/libfltk_s.a +f 0444 root sys /usr/lib32/libfltkgl.a lib/libfltkgl.a +f 0555 root sys /usr/lib32/libfltkgl_s.a src/libfltkgl_s.a +%system !irix-6.5 !hpux !aix f 0444 root sys /usr/lib/libfltk.a lib/libfltk.a -f 0555 root sys /usr/lib/libfltk.so.1 src/libfltk.so.1 -l 0000 root sys /usr/lib/libfltk.so libfltk.so.1 +f 0555 root sys /usr/lib/libfltk.so.1.1 src/libfltk.so.1.1 +l 0000 root sys /usr/lib/libfltk.so libfltk.so.1.1 +f 0444 root sys /usr/lib/libfltkgl.a lib/libfltkgl.a +f 0555 root sys /usr/lib/libfltkgl.so.1.1 src/libfltkgl.so.1.1 +l 0000 root sys /usr/lib/libfltkgl.so libfltkgl.so.1.1 %system all # Header files -f 0444 root sys /usr/include/FL/Enumerations.H FL/Enumerations.H +f 0444 root sys /usr/include/FL/ FL/*.H + +# Symlinks to handle common case problems... +l 0000 root sys /usr/include/Fl FL l 0000 root sys /usr/include/FL/Enumerations.h Enumerations.H -f 0444 root sys /usr/include/FL/Fl.H FL/Fl.H l 0000 root sys /usr/include/FL/Fl.h Fl.H -f 0444 root sys /usr/include/FL/Fl_Adjuster.H FL/Fl_Adjuster.H l 0000 root sys /usr/include/FL/Fl_Adjuster.h Fl_Adjuster.H -f 0444 root sys /usr/include/FL/Fl_Bitmap.H FL/Fl_Bitmap.H l 0000 root sys /usr/include/FL/Fl_Bitmap.h Fl_Bitmap.H -f 0444 root sys /usr/include/FL/Fl_Box.H FL/Fl_Box.H l 0000 root sys /usr/include/FL/Fl_Box.h Fl_Box.H -f 0444 root sys /usr/include/FL/Fl_Browser.H FL/Fl_Browser.H l 0000 root sys /usr/include/FL/Fl_Browser.h Fl_Browser.H -f 0444 root sys /usr/include/FL/Fl_Browser_.H FL/Fl_Browser_.H l 0000 root sys /usr/include/FL/Fl_Browser_.h Fl_Browser_.H -f 0444 root sys /usr/include/FL/Fl_Button.H FL/Fl_Button.H l 0000 root sys /usr/include/FL/Fl_Button.h Fl_Button.H -f 0444 root sys /usr/include/FL/Fl_Chart.H FL/Fl_Chart.H l 0000 root sys /usr/include/FL/Fl_Chart.h Fl_Chart.H -f 0444 root sys /usr/include/FL/Fl_Check_Button.H FL/Fl_Check_Button.H l 0000 root sys /usr/include/FL/Fl_Check_Button.h Fl_Check_Button.H -f 0444 root sys /usr/include/FL/Fl_Choice.H FL/Fl_Choice.H l 0000 root sys /usr/include/FL/Fl_Choice.h Fl_Choice.H -f 0444 root sys /usr/include/FL/Fl_Clock.H FL/Fl_Clock.H l 0000 root sys /usr/include/FL/Fl_Clock.h Fl_Clock.H -f 0444 root sys /usr/include/FL/Fl_Color_Chooser.H FL/Fl_Color_Chooser.H l 0000 root sys /usr/include/FL/Fl_Color_Chooser.h Fl_Color_Chooser.H -f 0444 root sys /usr/include/FL/Fl_Counter.H FL/Fl_Counter.H l 0000 root sys /usr/include/FL/Fl_Counter.h Fl_Counter.H -f 0444 root sys /usr/include/FL/Fl_Dial.H FL/Fl_Dial.H l 0000 root sys /usr/include/FL/Fl_Dial.h Fl_Dial.H -f 0444 root sys /usr/include/FL/Fl_Double_Window.H FL/Fl_Double_Window.H l 0000 root sys /usr/include/FL/Fl_Double_Window.h Fl_Double_Window.H -f 0444 root sys /usr/include/FL/Fl_Fill_Dial.H FL/Fl_Fill_Dial.H +l 0000 root sys /usr/include/FL/Fl_FileBrowser.h Fl_FileBrowser.H +l 0000 root sys /usr/include/FL/Fl_FileChooser.h Fl_FileChooser.H +l 0000 root sys /usr/include/FL/Fl_FileIcon.h Fl_FileIcon.H l 0000 root sys /usr/include/FL/Fl_Fill_Dial.h Fl_Fill_Dial.H -f 0444 root sys /usr/include/FL/Fl_Fill_Slider.H FL/Fl_Fill_Slider.H l 0000 root sys /usr/include/FL/Fl_Fill_Slider.h Fl_Fill_Slider.H -f 0444 root sys /usr/include/FL/Fl_Float_Input.H FL/Fl_Float_Input.H l 0000 root sys /usr/include/FL/Fl_Float_Input.h Fl_Float_Input.H -f 0444 root sys /usr/include/FL/Fl_FormsBitmap.H FL/Fl_FormsBitmap.H l 0000 root sys /usr/include/FL/Fl_FormsBitmap.h Fl_FormsBitmap.H -f 0444 root sys /usr/include/FL/Fl_FormsPixmap.H FL/Fl_FormsPixmap.H l 0000 root sys /usr/include/FL/Fl_FormsPixmap.h Fl_FormsPixmap.H -f 0444 root sys /usr/include/FL/Fl_Free.H FL/Fl_Free.H l 0000 root sys /usr/include/FL/Fl_Free.h Fl_Free.H -f 0444 root sys /usr/include/FL/Fl_Gl_Window.H FL/Fl_Gl_Window.H l 0000 root sys /usr/include/FL/Fl_Gl_Window.h Fl_Gl_Window.H -f 0444 root sys /usr/include/FL/Fl_Group.H FL/Fl_Group.H l 0000 root sys /usr/include/FL/Fl_Group.h Fl_Group.H -f 0444 root sys /usr/include/FL/Fl_Hold_Browser.H FL/Fl_Hold_Browser.H l 0000 root sys /usr/include/FL/Fl_Hold_Browser.h Fl_Hold_Browser.H -f 0444 root sys /usr/include/FL/Fl_Hor_Fill_Slider.H FL/Fl_Hor_Fill_Slider.H l 0000 root sys /usr/include/FL/Fl_Hor_Fill_Slider.h Fl_Hor_Fill_Slider.H -f 0444 root sys /usr/include/FL/Fl_Hor_Nice_Slider.H FL/Fl_Hor_Nice_Slider.H l 0000 root sys /usr/include/FL/Fl_Hor_Nice_Slider.h Fl_Hor_Nice_Slider.H -f 0444 root sys /usr/include/FL/Fl_Hor_Slider.H FL/Fl_Hor_Slider.H l 0000 root sys /usr/include/FL/Fl_Hor_Slider.h Fl_Hor_Slider.H -f 0444 root sys /usr/include/FL/Fl_Hor_Value_Slider.H FL/Fl_Hor_Value_Slider.H l 0000 root sys /usr/include/FL/Fl_Hor_Value_Slider.h Fl_Hor_Value_Slider.H -f 0444 root sys /usr/include/FL/Fl_Image.H FL/Fl_Image.H l 0000 root sys /usr/include/FL/Fl_Image.h Fl_Image.H -f 0444 root sys /usr/include/FL/Fl_Input.H FL/Fl_Input.H l 0000 root sys /usr/include/FL/Fl_Input.h Fl_Input.H -f 0444 root sys /usr/include/FL/Fl_Input_.H FL/Fl_Input_.H l 0000 root sys /usr/include/FL/Fl_Input_.h Fl_Input_.H -f 0444 root sys /usr/include/FL/Fl_Int_Input.H FL/Fl_Int_Input.H l 0000 root sys /usr/include/FL/Fl_Int_Input.h Fl_Int_Input.H -f 0444 root sys /usr/include/FL/Fl_Light_Button.H FL/Fl_Light_Button.H l 0000 root sys /usr/include/FL/Fl_Light_Button.h Fl_Light_Button.H -f 0444 root sys /usr/include/FL/Fl_Line_Dial.H FL/Fl_Line_Dial.H l 0000 root sys /usr/include/FL/Fl_Line_Dial.h Fl_Line_Dial.H -f 0444 root sys /usr/include/FL/Fl_Menu.H FL/Fl_Menu.H l 0000 root sys /usr/include/FL/Fl_Menu.h Fl_Menu.H -f 0444 root sys /usr/include/FL/Fl_Menu_.H FL/Fl_Menu_.H l 0000 root sys /usr/include/FL/Fl_Menu_.h Fl_Menu_.H -f 0444 root sys /usr/include/FL/Fl_Menu_Bar.H FL/Fl_Menu_Bar.H l 0000 root sys /usr/include/FL/Fl_Menu_Bar.h Fl_Menu_Bar.H -f 0444 root sys /usr/include/FL/Fl_Menu_Button.H FL/Fl_Menu_Button.H l 0000 root sys /usr/include/FL/Fl_Menu_Button.h Fl_Menu_Button.H -f 0444 root sys /usr/include/FL/Fl_Menu_Item.H FL/Fl_Menu_Item.H l 0000 root sys /usr/include/FL/Fl_Menu_Item.h Fl_Menu_Item.H -f 0444 root sys /usr/include/FL/Fl_Menu_Window.H FL/Fl_Menu_Window.H l 0000 root sys /usr/include/FL/Fl_Menu_Window.h Fl_Menu_Window.H -f 0444 root sys /usr/include/FL/Fl_Multi_Browser.H FL/Fl_Multi_Browser.H l 0000 root sys /usr/include/FL/Fl_Multi_Browser.h Fl_Multi_Browser.H -f 0444 root sys /usr/include/FL/Fl_Multi_Label.H FL/Fl_Multi_Label.H l 0000 root sys /usr/include/FL/Fl_Multi_Label.h Fl_Multi_Label.H -f 0444 root sys /usr/include/FL/Fl_Multiline_Input.H FL/Fl_Multiline_Input.H l 0000 root sys /usr/include/FL/Fl_Multiline_Input.h Fl_Multiline_Input.H -f 0444 root sys /usr/include/FL/Fl_Multiline_Output.H FL/Fl_Multiline_Output.H l 0000 root sys /usr/include/FL/Fl_Multiline_Output.h Fl_Multiline_Output.H -f 0444 root sys /usr/include/FL/Fl_Nice_Slider.H FL/Fl_Nice_Slider.H l 0000 root sys /usr/include/FL/Fl_Nice_Slider.h Fl_Nice_Slider.H -f 0444 root sys /usr/include/FL/Fl_Object.H FL/Fl_Object.H l 0000 root sys /usr/include/FL/Fl_Object.h Fl_Object.H -f 0444 root sys /usr/include/FL/Fl_Output.H FL/Fl_Output.H l 0000 root sys /usr/include/FL/Fl_Output.h Fl_Output.H -f 0444 root sys /usr/include/FL/Fl_Overlay_Window.H FL/Fl_Overlay_Window.H l 0000 root sys /usr/include/FL/Fl_Overlay_Window.h Fl_Overlay_Window.H -f 0444 root sys /usr/include/FL/Fl_Pack.H FL/Fl_Pack.H l 0000 root sys /usr/include/FL/Fl_Pack.h Fl_Pack.H -f 0444 root sys /usr/include/FL/Fl_Pixmap.H FL/Fl_Pixmap.H l 0000 root sys /usr/include/FL/Fl_Pixmap.h Fl_Pixmap.H -f 0444 root sys /usr/include/FL/Fl_Positioner.H FL/Fl_Positioner.H l 0000 root sys /usr/include/FL/Fl_Positioner.h Fl_Positioner.H -f 0444 root sys /usr/include/FL/Fl_Radio_Button.H FL/Fl_Radio_Button.H l 0000 root sys /usr/include/FL/Fl_Radio_Button.h Fl_Radio_Button.H -f 0444 root sys /usr/include/FL/Fl_Radio_Light_Button.H FL/Fl_Radio_Light_Button.H l 0000 root sys /usr/include/FL/Fl_Radio_Light_Button.h Fl_Radio_Light_Button.H -f 0444 root sys /usr/include/FL/Fl_Radio_Round_Button.H FL/Fl_Radio_Round_Button.H l 0000 root sys /usr/include/FL/Fl_Radio_Round_Button.h Fl_Radio_Round_Button.H -f 0444 root sys /usr/include/FL/Fl_Repeat_Button.H FL/Fl_Repeat_Button.H l 0000 root sys /usr/include/FL/Fl_Repeat_Button.h Fl_Repeat_Button.H -f 0444 root sys /usr/include/FL/Fl_Return_Button.H FL/Fl_Return_Button.H l 0000 root sys /usr/include/FL/Fl_Return_Button.h Fl_Return_Button.H -f 0444 root sys /usr/include/FL/Fl_Roller.H FL/Fl_Roller.H l 0000 root sys /usr/include/FL/Fl_Roller.h Fl_Roller.H -f 0444 root sys /usr/include/FL/Fl_Round_Button.H FL/Fl_Round_Button.H l 0000 root sys /usr/include/FL/Fl_Round_Button.h Fl_Round_Button.H -f 0444 root sys /usr/include/FL/Fl_Round_Clock.H FL/Fl_Round_Clock.H l 0000 root sys /usr/include/FL/Fl_Round_Clock.h Fl_Round_Clock.H -f 0444 root sys /usr/include/FL/Fl_Scroll.H FL/Fl_Scroll.H l 0000 root sys /usr/include/FL/Fl_Scroll.h Fl_Scroll.H -f 0444 root sys /usr/include/FL/Fl_Scrollbar.H FL/Fl_Scrollbar.H l 0000 root sys /usr/include/FL/Fl_Scrollbar.h Fl_Scrollbar.H -f 0444 root sys /usr/include/FL/Fl_Secret_Input.H FL/Fl_Secret_Input.H l 0000 root sys /usr/include/FL/Fl_Secret_Input.h Fl_Secret_Input.H -f 0444 root sys /usr/include/FL/Fl_Select_Browser.H FL/Fl_Select_Browser.H l 0000 root sys /usr/include/FL/Fl_Select_Browser.h Fl_Select_Browser.H -f 0444 root sys /usr/include/FL/Fl_Simple_Counter.H FL/Fl_Simple_Counter.H l 0000 root sys /usr/include/FL/Fl_Simple_Counter.h Fl_Simple_Counter.H -f 0444 root sys /usr/include/FL/Fl_Single_Window.H FL/Fl_Single_Window.H l 0000 root sys /usr/include/FL/Fl_Single_Window.h Fl_Single_Window.H -f 0444 root sys /usr/include/FL/Fl_Slider.H FL/Fl_Slider.H l 0000 root sys /usr/include/FL/Fl_Slider.h Fl_Slider.H -f 0444 root sys /usr/include/FL/Fl_Tabs.H FL/Fl_Tabs.H l 0000 root sys /usr/include/FL/Fl_Tabs.h Fl_Tabs.H -f 0444 root sys /usr/include/FL/Fl_Tile.H FL/Fl_Tile.H l 0000 root sys /usr/include/FL/Fl_Tile.h Fl_Tile.H -f 0444 root sys /usr/include/FL/Fl_Timer.H FL/Fl_Timer.H l 0000 root sys /usr/include/FL/Fl_Timer.h Fl_Timer.H -f 0444 root sys /usr/include/FL/Fl_Toggle_Button.H FL/Fl_Toggle_Button.H l 0000 root sys /usr/include/FL/Fl_Toggle_Button.h Fl_Toggle_Button.H -f 0444 root sys /usr/include/FL/Fl_Toggle_Light_Button.H FL/Fl_Toggle_Light_Button.H l 0000 root sys /usr/include/FL/Fl_Toggle_Light_Button.h Fl_Toggle_Light_Button.H -f 0444 root sys /usr/include/FL/Fl_Toggle_Round_Button.H FL/Fl_Toggle_Round_Button.H l 0000 root sys /usr/include/FL/Fl_Toggle_Round_Button.h Fl_Toggle_Round_Button.H -f 0444 root sys /usr/include/FL/Fl_Valuator.H FL/Fl_Valuator.H +l 0000 root sys /usr/include/FL/Fl_Tooltip.h Fl_Tooltip.H l 0000 root sys /usr/include/FL/Fl_Valuator.h Fl_Valuator.H -f 0444 root sys /usr/include/FL/Fl_Value_Input.H FL/Fl_Value_Input.H l 0000 root sys /usr/include/FL/Fl_Value_Input.h Fl_Value_Input.H -f 0444 root sys /usr/include/FL/Fl_Value_Output.H FL/Fl_Value_Output.H l 0000 root sys /usr/include/FL/Fl_Value_Output.h Fl_Value_Output.H -f 0444 root sys /usr/include/FL/Fl_Value_Slider.H FL/Fl_Value_Slider.H l 0000 root sys /usr/include/FL/Fl_Value_Slider.h Fl_Value_Slider.H -f 0444 root sys /usr/include/FL/Fl_Widget.H FL/Fl_Widget.H l 0000 root sys /usr/include/FL/Fl_Widget.h Fl_Widget.H -f 0444 root sys /usr/include/FL/Fl_Window.H FL/Fl_Window.H l 0000 root sys /usr/include/FL/Fl_Window.h Fl_Window.H -f 0444 root sys /usr/include/FL/dirent.h FL/dirent.h -f 0444 root sys /usr/include/FL/filename.H FL/filename.H l 0000 root sys /usr/include/FL/filename.h filename.H -f 0444 root sys /usr/include/FL/fl_ask.H FL/fl_ask.H l 0000 root sys /usr/include/FL/fl_ask.h fl_ask.H -f 0444 root sys /usr/include/FL/fl_draw.H FL/fl_draw.H l 0000 root sys /usr/include/FL/fl_draw.h fl_draw.H -f 0444 root sys /usr/include/FL/fl_file_chooser.H FL/fl_file_chooser.H l 0000 root sys /usr/include/FL/fl_file_chooser.h fl_file_chooser.H -f 0444 root sys /usr/include/FL/fl_message.H FL/fl_message.H l 0000 root sys /usr/include/FL/fl_message.h fl_message.H -f 0444 root sys /usr/include/FL/fl_show_colormap.H FL/fl_show_colormap.H l 0000 root sys /usr/include/FL/fl_show_colormap.h fl_show_colormap.H -f 0444 root sys /usr/include/FL/fl_show_input.H FL/fl_show_input.H l 0000 root sys /usr/include/FL/fl_show_input.h fl_show_input.H -f 0444 root sys /usr/include/FL/forms.H FL/forms.H l 0000 root sys /usr/include/FL/forms.h forms.H -f 0444 root sys /usr/include/FL/gl.h FL/gl.h -f 0444 root sys /usr/include/FL/gl2opengl.h FL/gl2opengl.h -f 0444 root sys /usr/include/FL/gl_draw.H FL/gl_draw.H l 0000 root sys /usr/include/FL/gl_draw.h gl_draw.H -f 0444 root sys /usr/include/FL/glut.H FL/glut.H l 0000 root sys /usr/include/FL/glut.h glut.H -f 0444 root sys /usr/include/FL/math.h FL/math.h -f 0444 root sys /usr/include/FL/menubar.h FL/menubar.h -f 0444 root sys /usr/include/FL/win32.H FL/win32.H l 0000 root sys /usr/include/FL/win32.h win32.H -f 0444 root sys /usr/include/FL/x.H FL/x.H l 0000 root sys /usr/include/FL/x.h x.H -l 0000 root sys /usr/include/Fl FL # Documentation -f 0444 root sys /usr/share/doc/fltk/adjuster1.gif documentation/adjuster1.gif -f 0444 root sys /usr/share/doc/fltk/ask.C.gif documentation/ask.C.gif -f 0444 root sys /usr/share/doc/fltk/basics.html documentation/basics.html -f 0444 root sys /usr/share/doc/fltk/bglogo.gif documentation/bglogo.gif -f 0444 root sys /usr/share/doc/fltk/boxtypes.gif documentation/boxtypes.gif -f 0444 root sys /usr/share/doc/fltk/buttons.gif documentation/buttons.gif -f 0444 root sys /usr/share/doc/fltk/button.C.gif documentation/button.C.gif -f 0444 root sys /usr/share/doc/fltk/charts.gif documentation/charts.gif -f 0444 root sys /usr/share/doc/fltk/choice.gif documentation/choice.gif -f 0444 root sys /usr/share/doc/fltk/clock.gif documentation/clock.gif -f 0444 root sys /usr/share/doc/fltk/common.html documentation/common.html -f 0444 root sys /usr/share/doc/fltk/counter.gif documentation/counter.gif -f 0444 root sys /usr/share/doc/fltk/cubeview.gif documentation/cubeview.gif -f 0444 root sys /usr/share/doc/fltk/dial.gif documentation/dial.gif -f 0444 root sys /usr/share/doc/fltk/drawing.html documentation/drawing.html -f 0444 root sys /usr/share/doc/fltk/editor-replace.gif documentation/editor-replace.gif -f 0444 root sys /usr/share/doc/fltk/editor.gif documentation/editor.gif -f 0444 root sys /usr/share/doc/fltk/editor.html documentation/editor.html -f 0444 root sys /usr/share/doc/fltk/enumerations.html documentation/enumerations.html -f 0444 root sys /usr/share/doc/fltk/events.html documentation/events.html -f 0444 root sys /usr/share/doc/fltk/filechooser.gif documentation/filechooser.gif -f 0444 root sys /usr/share/doc/fltk/fluid1.gif documentation/fluid1.gif -f 0444 root sys /usr/share/doc/fltk/fluid2.gif documentation/fluid2.gif -f 0444 root sys /usr/share/doc/fltk/fluid3.gif documentation/fluid3.gif -f 0444 root sys /usr/share/doc/fltk/fluid4.gif documentation/fluid4.gif -f 0444 root sys /usr/share/doc/fltk/fluid-org.gif documentation/fluid-org.gif -f 0444 root sys /usr/share/doc/fltk/fluid.gif documentation/fluid.gif -f 0444 root sys /usr/share/doc/fltk/fluid.html documentation/fluid.html -f 0444 root sys /usr/share/doc/fltk/fluid_main.gif documentation/fluid_main.gif -f 0444 root sys /usr/share/doc/fltk/fluid_prefs.gif documentation/fluid_prefs.gif -f 0444 root sys /usr/share/doc/fltk/fluid_widget.gif documentation/fluid_widget.gif -f 0444 root sys /usr/share/doc/fltk/FL.gif documentation/FL.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Adjuster.html documentation/Fl_Adjuster.html -f 0444 root sys /usr/share/doc/fltk/fl_alert.gif documentation/fl_alert.gif -f 0444 root sys /usr/share/doc/fltk/fl_ask.gif documentation/fl_ask.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Box.html documentation/Fl_Box.html -f 0444 root sys /usr/share/doc/fltk/Fl_Browser.html documentation/Fl_Browser.html -f 0444 root sys /usr/share/doc/fltk/Fl_Browser_.html documentation/Fl_Browser_.html -f 0444 root sys /usr/share/doc/fltk/Fl_Button.html documentation/Fl_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Chart.html documentation/Fl_Chart.html -f 0444 root sys /usr/share/doc/fltk/Fl_Check_Button.gif documentation/Fl_Check_Button.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Check_Button.html documentation/Fl_Check_Button.html -f 0444 root sys /usr/share/doc/fltk/fl_choice.gif documentation/fl_choice.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Choice.html documentation/Fl_Choice.html -f 0444 root sys /usr/share/doc/fltk/Fl_Clock.html documentation/Fl_Clock.html -f 0444 root sys /usr/share/doc/fltk/Fl_Color_Chooser.html documentation/Fl_Color_Chooser.html -f 0444 root sys /usr/share/doc/fltk/fl_color_chooser.jpg documentation/fl_color_chooser.jpg -f 0444 root sys /usr/share/doc/fltk/Fl_Counter.html documentation/Fl_Counter.html -f 0444 root sys /usr/share/doc/fltk/Fl_Dial.html documentation/Fl_Dial.html -f 0444 root sys /usr/share/doc/fltk/Fl_Double_Window.html documentation/Fl_Double_Window.html -f 0444 root sys /usr/share/doc/fltk/Fl_End.html documentation/Fl_End.html -f 0444 root sys /usr/share/doc/fltk/Fl_Float_Input.html documentation/Fl_Float_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Free.html documentation/Fl_Free.html -f 0444 root sys /usr/share/doc/fltk/Fl_Gl_Window.html documentation/Fl_Gl_Window.html -f 0444 root sys /usr/share/doc/fltk/Fl_Group.html documentation/Fl_Group.html -f 0444 root sys /usr/share/doc/fltk/Fl_Hold_Browser.html documentation/Fl_Hold_Browser.html -f 0444 root sys /usr/share/doc/fltk/fl_input.gif documentation/fl_input.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Input.html documentation/Fl_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Input_.html documentation/Fl_Input_.html -f 0444 root sys /usr/share/doc/fltk/Fl_Int_Input.html documentation/Fl_Int_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Light_Button.gif documentation/Fl_Light_Button.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Light_Button.html documentation/Fl_Light_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Menu_Bar.html documentation/Fl_Menu_Bar.html -f 0444 root sys /usr/share/doc/fltk/Fl_Menu_Button.html documentation/Fl_Menu_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Menu_Item.html documentation/Fl_Menu_Item.html -f 0444 root sys /usr/share/doc/fltk/Fl_Menu_Window.html documentation/Fl_Menu_Window.html -f 0444 root sys /usr/share/doc/fltk/Fl_Menu_.html documentation/Fl_Menu_.html -f 0444 root sys /usr/share/doc/fltk/fl_message.gif documentation/fl_message.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Multiline_Input.html documentation/Fl_Multiline_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Multiline_Output.html documentation/Fl_Multiline_Output.html -f 0444 root sys /usr/share/doc/fltk/Fl_Multi_Browser.html documentation/Fl_Multi_Browser.html -f 0444 root sys /usr/share/doc/fltk/Fl_Output.html documentation/Fl_Output.html -f 0444 root sys /usr/share/doc/fltk/Fl_Overlay_Window.html documentation/Fl_Overlay_Window.html -f 0444 root sys /usr/share/doc/fltk/Fl_Pack.html documentation/Fl_Pack.html -f 0444 root sys /usr/share/doc/fltk/fl_password.gif documentation/fl_password.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Positioner.html documentation/Fl_Positioner.html -f 0444 root sys /usr/share/doc/fltk/Fl_Repeat_Button.html documentation/Fl_Repeat_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Return_Button.gif documentation/Fl_Return_Button.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Return_Button.html documentation/Fl_Return_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Roller.gif documentation/Fl_Roller.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Roller.html documentation/Fl_Roller.html -f 0444 root sys /usr/share/doc/fltk/Fl_Round_Button.gif documentation/Fl_Round_Button.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Round_Button.html documentation/Fl_Round_Button.html -f 0444 root sys /usr/share/doc/fltk/Fl_Scrollbar.html documentation/Fl_Scrollbar.html -f 0444 root sys /usr/share/doc/fltk/Fl_Scroll.gif documentation/Fl_Scroll.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Scroll.html documentation/Fl_Scroll.html -f 0444 root sys /usr/share/doc/fltk/Fl_Secret_Input.html documentation/Fl_Secret_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Select_Browser.html documentation/Fl_Select_Browser.html -f 0444 root sys /usr/share/doc/fltk/fl_show_colormap.gif documentation/fl_show_colormap.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Single_Window.html documentation/Fl_Single_Window.html -f 0444 root sys /usr/share/doc/fltk/Fl_Slider.html documentation/Fl_Slider.html -f 0444 root sys /usr/share/doc/fltk/Fl_Tabs.html documentation/Fl_Tabs.html -f 0444 root sys /usr/share/doc/fltk/Fl_Tile.gif documentation/Fl_Tile.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Tile.html documentation/Fl_Tile.html -f 0444 root sys /usr/share/doc/fltk/Fl_Timer.html documentation/Fl_Timer.html -f 0444 root sys /usr/share/doc/fltk/Fl_Valuator.html documentation/Fl_Valuator.html -f 0444 root sys /usr/share/doc/fltk/Fl_Value_Input.gif documentation/Fl_Value_Input.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Value_Input.html documentation/Fl_Value_Input.html -f 0444 root sys /usr/share/doc/fltk/Fl_Value_Output.gif documentation/Fl_Value_Output.gif -f 0444 root sys /usr/share/doc/fltk/Fl_Value_Output.html documentation/Fl_Value_Output.html -f 0444 root sys /usr/share/doc/fltk/Fl_Value_Slider.html documentation/Fl_Value_Slider.html -f 0444 root sys /usr/share/doc/fltk/Fl_Widget.html documentation/Fl_Widget.html -f 0444 root sys /usr/share/doc/fltk/Fl_Window.html documentation/Fl_Window.html -f 0444 root sys /usr/share/doc/fltk/forms.html documentation/forms.html -f 0444 root sys /usr/share/doc/fltk/functions.html documentation/functions.html -f 0444 root sys /usr/share/doc/fltk/glut.html documentation/glut.html -f 0444 root sys /usr/share/doc/fltk/hello.C.gif documentation/hello.C.gif -f 0444 root sys /usr/share/doc/fltk/index.html documentation/index.html -f 0444 root sys /usr/share/doc/fltk/intro.html documentation/intro.html -f 0444 root sys /usr/share/doc/fltk/license.html documentation/license.html -f 0444 root sys /usr/share/doc/fltk/menubar.gif documentation/menubar.gif -f 0444 root sys /usr/share/doc/fltk/menu.gif documentation/menu.gif -f 0444 root sys /usr/share/doc/fltk/menu_button.gif documentation/menu_button.gif -f 0444 root sys /usr/share/doc/fltk/opengl.html documentation/opengl.html -f 0444 root sys /usr/share/doc/fltk/osissues.html documentation/osissues.html -f 0444 root sys /usr/share/doc/fltk/positioner.gif documentation/positioner.gif -f 0444 root sys /usr/share/doc/fltk/preface.html documentation/preface.html -f 0444 root sys /usr/share/doc/fltk/resizebox1.gif documentation/resizebox1.gif -f 0444 root sys /usr/share/doc/fltk/resizebox2.gif documentation/resizebox2.gif -f 0444 root sys /usr/share/doc/fltk/round_clock.gif documentation/round_clock.gif -f 0444 root sys /usr/share/doc/fltk/scrollbar.gif documentation/scrollbar.gif -f 0444 root sys /usr/share/doc/fltk/shape.C.gif documentation/shape.C.gif -f 0444 root sys /usr/share/doc/fltk/slider.gif documentation/slider.gif -f 0444 root sys /usr/share/doc/fltk/subclassing.html documentation/subclassing.html -f 0444 root sys /usr/share/doc/fltk/symbols.gif documentation/symbols.gif -f 0444 root sys /usr/share/doc/fltk/tabs.gif documentation/tabs.gif -f 0444 root sys /usr/share/doc/fltk/text.gif documentation/text.gif -f 0444 root sys /usr/share/doc/fltk/valuators.gif documentation/valuators.gif -f 0444 root sys /usr/share/doc/fltk/value_slider.gif documentation/value_slider.gif -f 0444 root sys /usr/share/doc/fltk/widgets.html documentation/widgets.html +f 0444 root sys /usr/share/doc/fltk/ documentation/*.gif +f 0444 root sys /usr/share/doc/fltk/ documentation/*.html +f 0444 root sys /usr/share/doc/fltk/ documentation/*.jpg +f 0444 root sys /usr/share/doc/fltk/COPYING COPYING +f 0444 root sys /usr/share/doc/fltk/CHANGES CHANGES # -# End of "$Id: fltk.list,v 1.1.2.6 2001/05/07 14:51:10 easysw Exp $". +# End of "$Id: fltk.list,v 1.1.2.6.2.1 2001/08/02 18:08:36 easysw Exp $". # @@ -1,5 +1,5 @@ # -# "$Id: fltk.spec,v 1.1.2.9 2001/05/07 14:51:10 easysw Exp $" +# "$Id: fltk.spec,v 1.1.2.9.2.1 2001/08/02 18:08:36 easysw Exp $" # # RPM spec file for FLTK. # @@ -23,8 +23,8 @@ # Please report all bugs and problems to "fltk-bugs@fltk.org". # -%define version 1.0.11 -%define release 1 +%define version 1.1.0 +%define release 0 %define prefix /usr Summary: Fast Light Tool Kit (FLTK) @@ -39,13 +39,12 @@ Packager: Michael Sweet <mike@easysw.com> # use BuildRoot so as not to disturb the version already installed BuildRoot: /var/tmp/fltk-%{PACKAGE_VERSION} -%description -The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a LGPL'd -C++ graphical user interface toolkit for X (UNIX(r)), OpenGL(r), -and Microsoft(r) Windows(r) NT 4.0, 95, or 98. It was originally -developed by Mr. Bill Spitzak and is currently maintained by a -small group of developers across the world with a central -repository in the US. +%description The Fast Light Tool Kit ("FLTK", pronounced +"fulltick") is a LGPL'd C++ graphical user interface toolkit for +X (UNIX(r)), OpenGL(r), and Microsoft(r) Windows(r). It was +originally developed by Mr. Bill Spitzak and is currently +maintained by a small group of developers across the world with +a central repository in the US. %package devel Summary: FLTK - development environment @@ -91,5 +90,5 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/fltk/* # -# End of "$Id: fltk.spec,v 1.1.2.9 2001/05/07 14:51:10 easysw Exp $". +# End of "$Id: fltk.spec,v 1.1.2.9.2.1 2001/08/02 18:08:36 easysw Exp $". # diff --git a/fluid/Makefile b/fluid/Makefile index 47806de05..4025dc366 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.10.2.6.2.1 2001/08/02 15:31:59 easysw Exp $" +# "$Id: Makefile,v 1.10.2.6.2.2 2001/08/02 18:08:36 easysw Exp $" # # Fluid makefile for the Fast Light Tool Kit (FLTK). # @@ -51,7 +51,7 @@ include ../makeinclude $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) echo Linking $@... - $(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -lfltk $(LDLIBS) + $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS) clean : -@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend @@ -85,5 +85,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.10.2.6.2.1 2001/08/02 15:31:59 easysw Exp $". +# End of "$Id: Makefile,v 1.10.2.6.2.2 2001/08/02 18:08:36 easysw Exp $". # diff --git a/makeinclude.in b/makeinclude.in index 3da493eda..6fdac64bd 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.in,v 1.7.2.11 2001/04/14 11:11:43 easysw Exp $" +# "$Id: makeinclude.in,v 1.7.2.11.2.1 2001/08/02 18:08:36 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # @configure_input@ @@ -49,14 +49,18 @@ CXXFLAGS =@CPPFLAGS@ @CXXFLAGS@ # program to make the archive: LIBNAME =@LIBNAME@ +GLLIBNAME =@GLLIBNAME@ LIBCOMMAND =@LIBCOMMAND@ RANLIB =@RANLIB@ DSONAME =@DSONAME@ +GLDSONAME =@DSONAME@ DSOCOMMAND =@DSOCOMMAND@ # libraries to link with: LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm +LINKFLTK =-L../lib @LINKFLTK@ +LINKFLTKGL =-L../lib @LINKFLTKGL@ # Man page extensions... CAT1EXT =@CAT1EXT@ @@ -70,7 +74,7 @@ CAT3EXT =@CAT3EXT@ .cxx: echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ .c.o: echo Compiling $@... @@ -93,5 +97,5 @@ CAT3EXT =@CAT3EXT@ mv t.z $@ # -# End of "$Id: makeinclude.in,v 1.7.2.11 2001/04/14 11:11:43 easysw Exp $". +# End of "$Id: makeinclude.in,v 1.7.2.11.2.1 2001/08/02 18:08:36 easysw Exp $". # diff --git a/src/Makefile b/src/Makefile index f49143974..64f59dd5e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18.2.14.2.3 2001/08/02 16:17:04 easysw Exp $" +# "$Id: Makefile,v 1.18.2.14.2.4 2001/08/02 18:08:36 easysw Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -44,9 +44,6 @@ CPPFILES = \ Fl_FileChooser.cxx \ Fl_FileChooser2.cxx \ Fl_FileIcon.cxx \ - Fl_Gl_Choice.cxx \ - Fl_Gl_Overlay.cxx \ - Fl_Gl_Window.cxx \ Fl_Group.cxx \ Fl_Image.cxx \ Fl_Input.cxx \ @@ -139,7 +136,12 @@ CPPFILES = \ forms_free.cxx \ forms_fselect.cxx \ forms_pixmap.cxx \ - forms_timer.cxx \ + forms_timer.cxx + +GLCPPFILES = \ + Fl_Gl_Choice.cxx \ + Fl_Gl_Overlay.cxx \ + Fl_Gl_Window.cxx \ gl_draw.cxx \ gl_start.cxx \ glut_compatability.cxx \ @@ -153,21 +155,43 @@ CLEAN = include ../makeinclude -LIBRARY = ../lib/$(LIBNAME) - OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) +GLOBJECTS = $(GLCPPFILES:.cxx=.o) -all: $(LIBRARY) $(DSONAME) +all: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) -$(LIBRARY): $(OBJECTS) +$(LIBNAME): $(OBJECTS) echo $(LIBCOMMAND) $@ ... $(LIBCOMMAND) $@ $(OBJECTS) $(RANLIB) $@ -libfltk.so.1 libfltk.sl.1: $(OBJECTS) +libfltk.so.1.1 libfltk.sl.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) +libfltk_s.a: $(OBJECTS) + echo $(DSOCOMMAND) libfltk_s.o ... + $(DSOCOMMAND) libfltk_s.o $(OBJECTS) + echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o + $(LIBCOMMAND) libfltk_s.a libfltk_s.o + chmod +x libfltk_s.a + +$(GLLIBNAME): $(GLOBJECTS) + echo $(LIBCOMMAND) $@ ... + $(LIBCOMMAND) $@ $(GLOBJECTS) + $(RANLIB) $@ + +libfltkgl.so.1.1 libfltkgl.sl.1.1: $(GLOBJECTS) + echo $(DSOCOMMAND) $@ ... + $(DSOCOMMAND) $@ $(GLOBJECTS) + +libfltkgl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltkgl_s.o ... + $(DSOCOMMAND) libfltkgl_s.o $(GLOBJECTS) + echo $(LIBCOMMAND) libfltkgl_s.a libfltkgl_s.o + $(LIBCOMMAND) libfltkgl_s.a libfltkgl_s.o + chmod +x libfltkgl_s.a + clean : -@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap touch makedepend @@ -180,31 +204,44 @@ include makedepend ################################################################ -install: $(LIBRARY) $(DSONAME) +install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) echo "Installing libraries..." -mkdir -p $(libdir) rm -f $(libdir)/$(LIBNAME) - -cp $(LIBRARY) $(libdir) - -chmod 644 $(libdir)/$(LIBNAME) - if test "$(DSONAME)" = libfltk.so.1; then\ + -cp $(LIBNAME) $(GLLIBNAME) $(libdir) + if test x$(DSONAME) = xlibfltk.so.1.1; then\ rm -f $(libdir)/libfltk.so*;\ - cp libfltk.so.1 $(libdir); \ - chmod 755 $(libdir)/libfltk.so.1; \ - ln -s libfltk.so.1 $(libdir)/libfltk.so;\ + cp libfltk.so.1.1 $(libdir); \ + ln -s libfltk.so.1.1 $(libdir)/libfltk.so;\ fi - if test "$(DSONAME)" = libfltk.sl.1; then\ + if test x$(DSONAME) = xlibfltk.sl.1.1; then\ rm -f $(libdir)/libfltk.sl*;\ - cp libfltk.sl.1 $(libdir); \ - chmod 755 $(libdir)/libfltk.sl.1; \ - ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\ + cp libfltk.sl.1.1 $(libdir); \ + 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); \ + fi + if test x$(GLDSONAME) = xlibfltkgl.so.1.1; then\ + rm -f $(libdir)/libfltkgl.so*;\ + cp libfltkgl.so.1.1 $(libdir); \ + ln -s libfltkgl.so.1.1 $(libdir)/libfltkgl.so;\ + fi + if test x$(GLDSONAME) = xlibfltkgl.sl.1.1; then\ + rm -f $(libdir)/libfltkgl.sl*;\ + cp libfltkgl.sl.1.1 $(libdir); \ + ln -s libfltkgl.sl.1.1 $(libdir)/libfltkgl.sl;\ + fi + if test x$(GLDSONAME) = xlibfltkgl_s.a; then\ + rm -f $(libdir)/libfltkgl_s.a;\ + cp libfltkgl_s.a $(libdir); \ fi echo "Installing include files..." -mkdir -p $(includedir) rm -rf $(includedir)/FL mkdir $(includedir)/FL cp ../FL/*.[hH] $(includedir)/FL - -chmod 755 $(includedir)/FL - -chmod 644 $(includedir)/FL/* cd $(includedir)/FL;\ for file in *.H; do\ ln -s $$file "`basename $$file H`h";\ @@ -213,5 +250,5 @@ install: $(LIBRARY) $(DSONAME) ln -s FL $(includedir)/Fl # -# End of "$Id: Makefile,v 1.18.2.14.2.3 2001/08/02 16:17:04 easysw Exp $". +# End of "$Id: Makefile,v 1.18.2.14.2.4 2001/08/02 18:08:36 easysw Exp $". # diff --git a/test/Makefile b/test/Makefile index f9f0e07f3..f551801b3 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.1 2001/08/02 15:31:59 easysw Exp $" +# "$Id: Makefile,v 1.19.2.7.2.2 2001/08/02 18:08:36 easysw Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -56,52 +56,54 @@ include ../makeinclude .fl: echo Generating, compiling, and linking $@... ../fluid/fluid -c $< - $(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@ $(ALL): ../lib/$(LIBNAME) -# Other programs needing special "help"... +# Programs needing special instructions... +keyboard: keyboard.cxx keyboard_ui.cxx + echo Compiling and linking $@... + $(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@ +mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx + echo Compiling and linking $@... + $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@ + +# OpenGL demos... CubeView: CubeMain.o CubeView.o CubeViewUI.o echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \ - -lfltk $(GLDLIBS) -o $@ + $(CXX) $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \ + $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ CubeMain.o: CubeViewUI.h CubeView.h CubeView.o: CubeView.h cube: cube.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ fractals: fractals.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ fullscreen: fullscreen.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ glpuzzle: glpuzzle.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ gl_overlay: gl_overlay.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ shiny: shiny.cxx shiny_panel.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx -lfltk $(GLDLIBS) -o $@ -keyboard: keyboard.cxx keyboard_ui.cxx - echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx -lfltk $(LDLIBS) -o $@ -mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx - echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ shape: shape.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx -lfltk $(GLDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ # If you have libjpeg installed, you might want to try this test program: jpeg_image: jpeg_image.cxx echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -lfltk $(LDLIBS) -ljpeg -lXext -o $@ + $(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@ depend: # $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend @@ -114,5 +116,5 @@ install: @echo Nothing to install in test directory. # -# End of "$Id: Makefile,v 1.19.2.7.2.1 2001/08/02 15:31:59 easysw Exp $". +# End of "$Id: Makefile,v 1.19.2.7.2.2 2001/08/02 18:08:36 easysw Exp $". # |