Change the Fl_Group current, add, and remove methods so they are no longer

inline; this should make shared libraries work better on all platforms.

Link FLUID against shared libraries, too, so that the installed fluid is
also using shared libraries (still make a statically linked fluid for the
build)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-07-14 17:03:31 +00:00
parent 8e2ff29500
commit 3346a9fee7
14 changed files with 356 additions and 247 deletions

View File

@ -1,5 +1,11 @@
CHANGES IN FLTK 1.1.0
- When installing shared libraries, FLUID is now linked
against the shared libraries.
- MacOS: missing compile rule for .dylib files.
- Fl_Group::current(), Fl_Group::begin(), and
Fl_Group::end() are no longer inlined so that they are
properly exported in DLLs under WIN32.
- MacOS: support for Mac system menu (Fl_Sys_Menu_Bar)
- MacOS: wait(0) would not handle all pending events
- Added new makeinclude file for MingW using GCC 3.1.x.

View File

@ -1,5 +1,5 @@
/*
* "$Id: Fl_Export.H,v 1.3.2.4 2002/07/11 22:43:52 matthiaswm Exp $"
* "$Id: Fl_Export.H,v 1.3.2.5 2002/07/14 17:03:30 easysw Exp $"
*
* WIN32 DLL export definitions for the Fast Light Tool Kit (FLTK).
*
@ -27,11 +27,10 @@
# define Fl_Export_H
/*
* The following is only used when building DLLs under WIN32 with Visual C++
* or CodeWarrior...
* The following is only used when building DLLs under WIN32...
*/
# if defined(FL_DLL) && ( defined(_MSC_VER) || defined(__MWERKS__) )
# if defined(FL_DLL) && (defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) || __GNUC__ >= 3)
# ifdef FL_LIBRARY
# define FL_EXPORT __declspec(dllexport)
# else
@ -39,10 +38,10 @@
# endif /* FL_LIBRARY */
# else
# define FL_EXPORT
# endif /* FL_DLL && ( _MSC_VER || __MWERKS__ ) */
# endif /* FL_DLL */
#endif /* !Fl_Export_H */
/*
* End of "$Id: Fl_Export.H,v 1.3.2.4 2002/07/11 22:43:52 matthiaswm Exp $".
* End of "$Id: Fl_Export.H,v 1.3.2.5 2002/07/14 17:03:30 easysw Exp $".
*/

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Group.H,v 1.6.2.4.2.3 2002/07/11 22:43:52 matthiaswm Exp $"
// "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $"
//
// Group header file for the Fast Light Tool Kit (FLTK).
//
@ -52,15 +52,10 @@ protected:
public:
FL_EXPORT int handle(int);
#ifdef __MWERKS__
FL_EXPORT void begin();
FL_EXPORT void end();
#else
void begin() {current_ = this;}
void end() {current_ = (Fl_Group*)parent();}
#endif
static Fl_Group *current() {return current_;}
static void current(Fl_Group *g) {current_ = g;}
FL_EXPORT static Fl_Group *current();
FL_EXPORT static void current(Fl_Group *g);
int children() const {return children_;}
Fl_Widget* child(int n) const {return array()[n];}
@ -101,5 +96,5 @@ public:
#endif
//
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.3 2002/07/11 22:43:52 matthiaswm Exp $".
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile.in,v 1.1.2.5 2002/02/15 18:15:45 easysw Exp $"
# "$Id: Makefile.in,v 1.1.2.6 2002/07/14 17:03:30 easysw Exp $"
#
# Header makefile for the Fast Light Tool Kit (FLTK).
#
@ -29,30 +29,30 @@ all:
install:
echo "Installing include files in $(includedir)..."
-mkdir -p $(includedir)
rm -rf $(includedir)/FL
mkdir $(includedir)/FL
chmod 755 $(includedir)/FL
cp ../FL/*.[hHr] $(includedir)/FL
chmod 644 $(includedir)/FL/*.[hHr]
-$(MKDIR) -p $(includedir)
$(RMDIR) $(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";\
@HLINKS@ ln -s $$file "`basename $$file H`h";\
@HLINKS@ $(RM) "`basename $$file H`h";\
@HLINKS@ $(LN) $$file "`basename $$file H`h";\
@HLINKS@ done
@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.H
@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.h
@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
@HLINKS@ rm -f $(includedir)/Fl
@HLINKS@ ln -s FL $(includedir)/Fl
@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(RM) $(includedir)/Fl
@HLINKS@ $(LN) FL $(includedir)/Fl
uninstall:
echo "Uninstalling include files..."
rm -rf $(includedir)/FL
@HLINKS@ rm -f $(includedir)/Fl
$(RMDIR) $(includedir)/FL
@HLINKS@ $(RM) $(includedir)/Fl
#
# End of "$Id: Makefile.in,v 1.1.2.5 2002/02/15 18:15:45 easysw Exp $".
# End of "$Id: Makefile.in,v 1.1.2.6 2002/07/14 17:03:30 easysw Exp $".
#

View File

@ -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.78 2002/07/12 02:04:53 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.79 2002/07/14 17:03:30 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@ -109,6 +109,9 @@ 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 test x$enable_shared = xyes; then
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
case $uname in
Darwin*)
DSONAME="libfltk.$FL_API_VERSION.dylib"
@ -177,6 +180,7 @@ if test x$enable_shared = xyes; then
GLDSONAME="libfltk_gl_s.a"
IMGDSONAME="libfltk_images_s.a"
DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o"
SHAREDSUFFIX="_s"
;;
CYGWIN* | MINGW*)
AC_MSG_WARN(Shared libraries are not supported under CygWin.)
@ -190,6 +194,8 @@ if test x$enable_shared = xyes; then
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
;;
esac
LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@ -198,6 +204,9 @@ else
GLDSONAME=""
IMGDSONAME=""
PICFLAG=0
SHAREDSUFFIX=""
FLUID="fluid"
LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
fi
AC_SUBST(DSOCOMMAND)
@ -206,6 +215,9 @@ AC_SUBST(DSONAME)
AC_SUBST(FLDSONAME)
AC_SUBST(GLDSONAME)
AC_SUBST(IMGDSONAME)
AC_SUBST(SHAREDSUFFIX)
AC_SUBST(LINKSHARED)
AC_SUBST(FLUID)
AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support])
@ -766,5 +778,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.78 2002/07/12 02:04:53 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.79 2002/07/14 17:03:30 easysw Exp $".
dnl

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.9.2.10.2.17 2002/06/07 17:21:43 easysw Exp $"
# "$Id: Makefile,v 1.9.2.10.2.18 2002/07/14 17:03:30 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
@ -211,9 +211,9 @@ all: $(MANPAGES)
alldocs: fltk.ps fltk.pdf fltk.d/index.html $(MANPAGES)
clean:
rm -f fltk.ps
rm -f fltk.pdf
rm -rf fltk.d
$(RM) fltk.ps
$(RM) fltk.pdf
$(RMDIR) fltk.d
depend:
@ -225,54 +225,54 @@ docdir = $(datadir)/doc/fltk
install: $(MANPAGES)
echo "Installing documentation files in $(docdir)..."
-mkdir -p $(docdir)
cp $(HTMLFILES) *.gif *.jpg index.html $(docdir)
chmod 644 $(docdir)/*
-$(MKDIR) $(docdir)
$(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
$(CHMOD) 644 $(docdir)/*
echo "Installing man pages in $(mandir)..."
-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
-$(MKDIR) $(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) $(mandir)/cat3
$(CP) fltk.$(CAT3EXT) $(mandir)/cat3
$(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT)
-$(MKDIR) $(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) $(mandir)/man3
$(CP) fltk.man $(mandir)/man3/fltk.3
$(CHMOD) 644 $(mandir)/man3/fltk.3
uninstall:
rm -rf $(docdir)
rm -f $(mandir)/cat1/fluid.$(CAT1EXT)
rm -f $(mandir)/man1/fluid.1
rm -f $(mandir)/cat3/fltk.$(CAT3EXT)
rm -f $(mandir)/man3/fltk.3
$(RMDIR) $(docdir)
$(RM) $(mandir)/cat1/fluid.$(CAT1EXT)
$(RM) $(mandir)/man1/fluid.1
$(RM) $(mandir)/cat3/fltk.$(CAT3EXT)
$(RM) $(mandir)/man3/fltk.3
# Base html files are now the readable ones, so this target is not make by
# default...
fltk.d/index.html: $(HTMLFILES) $(IMAGEFILES)
echo "Generating HTML documentation..."
-mkdir fltk.d
-rm -f fltk.d/*
-$(RMDIR) fltk.d
-$(MKDIR) fltk.d
$(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html
fltk.ps: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PostScript documentation..."
rm -f fltk.ps
$(RM) fltk.ps
$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.ps
fltk.pdf: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PDF documentation..."
rm -f fltk.pdf
$(RM) fltk.pdf
$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
#
# End of "$Id: Makefile,v 1.9.2.10.2.17 2002/06/07 17:21:43 easysw Exp $".
# End of "$Id: Makefile,v 1.9.2.10.2.18 2002/07/14 17:03:30 easysw Exp $".
#

View File

@ -1,6 +1,6 @@
#! /bin/sh
#
# "$Id: fltk-config.in,v 1.12.2.13 2002/07/11 10:37:49 easysw Exp $"
# "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $"
#
# FLTK configuration utility.
#
@ -60,6 +60,7 @@ LIBNAME="@LIBNAME@"
DSONAME="@DSONAME@"
DSOLINK="@DSOLINK@"
IMAGELIBS="@IMAGELIBS@"
SHAREDSUFFIX="@SHAREDSUFFIX@"
usage ()
{
@ -101,12 +102,6 @@ compile=
post=
debug=
# AIX has very poor handling of static and shared libraries; always use
# the image libraries under AIX...
if test `uname` = AIX; then
use_images=yes
fi
# Parse command line options
while test $# -gt 0
do
@ -199,21 +194,21 @@ fi
# Calculate needed libraries
LDSTATIC="$libdir/libfltk.a $LDLIBS"
LDLIBS="$libs -lfltk $LDLIBS"
LDLIBS="$libs -lfltk$SHAREDSUFFIX $LDLIBS"
LIBS="$LIBS $libdir/libfltk.a"
if test x$use_forms = xyes; then
LDLIBS="-lfltk_forms $LDLIBS"
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
LIBS="$LIBS $libdir/libfltk_forms.a"
fi
if test x$use_gl = xyes; then
LDLIBS="-lfltk_gl @GLLIB@ $LDLIBS"
LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
LIBS="$LIBS $libdir/libfltk_gl.a"
fi
if test x$use_images = xyes; then
LDLIBS="-lfltk_images $IMAGELIBS $LDLIBS"
LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC"
fi
@ -297,5 +292,5 @@ if test "$echo_libs" = "yes"; then
fi
#
# End of "$Id: fltk-config.in,v 1.12.2.13 2002/07/11 10:37:49 easysw Exp $".
# End of "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $"
# "$Id: Makefile,v 1.10.2.6.2.21 2002/07/14 17:03:31 easysw Exp $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
@ -23,8 +23,6 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
PROGRAM = fluid$(EXEEXT)
CPPFILES = \
Fl_Function_Type.cxx \
Fl_Menu_Type.cxx \
@ -47,18 +45,26 @@ CPPFILES = \
OBJECTS = $(CPPFILES:.cxx=.o)
CLEAN = core
CLEAN = core*
include ../makeinclude
$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
../lib/$(IMGLIBNAME)
echo Linking $@...
$(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTKFORMS) \
-lfltk_images $(IMAGELIBS) $(LDLIBS)
$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) -lfltk_images $(IMAGELIBS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
../src/$(IMGDSONAME)
echo Linking $@...
$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
clean :
-@ rm -f *.o $(PROGRAM) $(CLEAN)
-@ $(RM) *.o fluid$(EXEEXT) fluid-shared$(EXEEXT) $(CLEAN)
depend: $(CPPFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES)
@ -68,14 +74,14 @@ include makedepend
install: $(PROGRAM)
echo "Installing FLUID in $(bindir)..."
-mkdir -p $(bindir)
cp $(PROGRAM) $(bindir)
strip $(bindir)/$(PROGRAM)
$(bindir)/fltk-config --post $(bindir)/$(PROGRAM)
chmod 755 $(bindir)/$(PROGRAM)
-$(MKDIR) $(bindir)
$(CP) $(FLUID) $(bindir)/fluid
$(STRIP) $(bindir)/fluid
$(bindir)/fltk-config --post $(bindir)/fluid
$(CHMOD) 755 $(bindir)/fluid
uninstall:
rm -f $(bindir)/$(PROGRAM)
$(RM) $(bindir)/fluid
#
# Note: The rebuild target can only be used if you have the original .fl
@ -89,5 +95,5 @@ rebuild:
./fluid -c widget_panel.fl
#
# End of "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $".
# End of "$Id: Makefile,v 1.10.2.6.2.21 2002/07/14 17:03:31 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw,v 1.1.2.3.2.10 2002/07/09 17:41:24 easysw Exp $"
# "$Id: makeinclude.mingw,v 1.1.2.3.2.11 2002/07/14 17:03:31 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# (this file for MingW using GCC 2.95.x)
@ -54,6 +54,17 @@ includedir = ${prefix}/include
libdir = ${exec_prefix}/lib
srcdir = .
# programs we use...
CHMOD = :
CP = copy
HTMLDOC = htmldoc.exe
LN = :
MKDIR = md
NROFF = nroff
RM = del
RMDIR = rd
STRIP = :
# compiler names:
CXX = g++
CC = gcc
@ -70,7 +81,6 @@ FLLIBNAME = ../lib/libfltk_forms.a
GLLIBNAME = ../lib/libfltk_gl.a
IMGLIBNAME = ../lib/libfltk_images.a
LIBCOMMAND = ar -ruv
RM = del
RANLIB = ranlib
DSONAME =
FLDSONAME =
@ -112,5 +122,5 @@ THREADS =threads
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.10 2002/07/09 17:41:24 easysw Exp $".
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.11 2002/07/14 17:03:31 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw31,v 1.1.2.1 2002/07/09 17:41:24 easysw Exp $"
# "$Id: makeinclude.mingw31,v 1.1.2.2 2002/07/14 17:03:31 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# (this file for MingW using GCC 3.1.x)
@ -54,6 +54,17 @@ includedir = ${prefix}/include
libdir = ${exec_prefix}/lib
srcdir = .
# programs we use...
CHMOD = :
CP = copy
HTMLDOC = htmldoc.exe
LN = :
MKDIR = md
NROFF = nroff
RM = del
RMDIR = rd
STRIP = :
# compiler names:
CXX = g++
CC = gcc
@ -70,7 +81,6 @@ FLLIBNAME = ../lib/libfltk_forms.a
GLLIBNAME = ../lib/libfltk_gl.a
IMGLIBNAME = ../lib/libfltk_images.a
LIBCOMMAND = ar -ruv
RM = del
RANLIB = ranlib
DSONAME =
FLDSONAME =
@ -112,5 +122,5 @@ THREADS =threads
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.mingw31,v 1.1.2.1 2002/07/09 17:41:24 easysw Exp $".
# End of "$Id: makeinclude.mingw31,v 1.1.2.2 2002/07/14 17:03:31 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.os2x,v 1.1.2.4.2.8 2002/07/09 17:41:24 easysw Exp $"
# "$Id: makeinclude.os2x,v 1.1.2.4.2.9 2002/07/14 17:03:31 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -34,9 +34,15 @@ srcdir = ./.
VPATH = ./.
# programs we use...
CHMOD = :
CP = copy
HTMLDOC = htmldoc.exe
LN = :
MKDIR = md
NROFF = nroff
RM = rm -f
RM = del
RMDIR = rd
STRIP = :
# compiler names:
CXX = gcc.exe
@ -118,5 +124,5 @@ CAT3EXT =3
mv t.z $@
#
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.8 2002/07/09 17:41:24 easysw Exp $".
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.9 2002/07/14 17:03:31 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.in,v 1.7.2.11.2.19 2002/06/28 21:04:35 easysw Exp $"
# "$Id: makeinclude.in,v 1.7.2.11.2.20 2002/07/14 17:03:30 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@
@ -24,68 +24,78 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
prefix =@prefix@
exec_prefix =@exec_prefix@
bindir =@bindir@
datadir =@datadir@
includedir =@includedir@
libdir =@libdir@
mandir =@mandir@
srcdir =@srcdir@
VPATH =@srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir = @datadir@
includedir = @includedir@
libdir = @libdir@
mandir = @mandir@
srcdir = @srcdir@
VPATH = @srcdir@
# programs we use...
HTMLDOC =@HTMLDOC@
NROFF =@NROFF@
RM =/bin/rm -f
CHMOD = chmod
CP = cp
HTMLDOC = @HTMLDOC@
LN = ln -s
MKDIR = mkdir -p
NROFF = @NROFF@
RM = rm -f
RMDIR = rm -rf
STRIP = strip
# compiler names:
CXX =@CXX@
CC =@CC@
MAKEDEPEND =@MAKEDEPEND@
CXX = @CXX@
CC = @CC@
MAKEDEPEND = @MAKEDEPEND@
# flags for C++ compiler:
OPTIM =@OPTIM@
CFLAGS =$(OPTIM) @CFLAGS@
CXXFLAGS =$(OPTIM) @CXXFLAGS@
OPTIM = @OPTIM@
CFLAGS = $(OPTIM) @CFLAGS@
CXXFLAGS = $(OPTIM) @CXXFLAGS@
# program to make the archive:
LIBNAME =@LIBNAME@
FLLIBNAME =@FLLIBNAME@
GLLIBNAME =@GLLIBNAME@
IMGLIBNAME =@IMGLIBNAME@
LIBCOMMAND =@LIBCOMMAND@
RANLIB =@RANLIB@
DSONAME =@DSONAME@
FLDSONAME =@FLDSONAME@
GLDSONAME =@GLDSONAME@
IMGDSONAME =@IMGDSONAME@
DSOCOMMAND =@DSOCOMMAND@
LIBNAME = @LIBNAME@
FLLIBNAME = @FLLIBNAME@
GLLIBNAME = @GLLIBNAME@
IMGLIBNAME = @IMGLIBNAME@
LIBCOMMAND = @LIBCOMMAND@
RANLIB = @RANLIB@
DSONAME = @DSONAME@
FLDSONAME = @FLDSONAME@
GLDSONAME = @GLDSONAME@
IMGDSONAME = @IMGDSONAME@
DSOCOMMAND = @DSOCOMMAND@
# libraries to link with:
LDLIBS =@LDFLAGS@ @LIBS@ $(LDFLAGS_MIPSPRO)
GLDLIBS =@LDFLAGS@ @GLLIB@ @LIBS@ $(LDFLAGS_MIPSPRO)
LINKFLTK =-L../lib @LINKFLTK@
LINKFLTKGL =-L../lib @LINKFLTKGL@
LINKFLTKFORMS =-L../lib -lfltk_forms @LINKFLTK@
LINKFLTKIMG =-L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS)
IMAGELIBS =@IMAGELIBS@
LDLIBS = @LDFLAGS@ @LIBS@ $(LDFLAGS_MIPSPRO)
GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ $(LDFLAGS_MIPSPRO)
LINKFLTK = -L../lib @LINKFLTK@
LINKFLTKGL = -L../lib @LINKFLTKGL@
LINKFLTKFORMS = -L../lib -lfltk_forms @LINKFLTK@
LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS)
LINKSHARED = @LINKSHARED@ $(IMAGELIBS)
IMAGELIBS = @IMAGELIBS@
# Do we build the OpenGL demos?
GLDEMOS =@GLDEMOS@
GLDEMOS = @GLDEMOS@
# Do we build the threads demo?
THREADS =@THREADS@
THREADS = @THREADS@
# Name of FLUID executable we install
FLUID = @FLUID@
# The extension to use for executables...
EXEEXT =@EXEEXT@
EXEEXT = @EXEEXT@
# Possible steps after linking...
POSTBUILD =@POSTBUILD@
POSTBUILD = @POSTBUILD@
# Man page extensions...
CAT1EXT =@CAT1EXT@
CAT3EXT =@CAT3EXT@
CAT1EXT = @CAT1EXT@
CAT3EXT = @CAT3EXT@
# Be quiet when building...
.SILENT:
@ -119,5 +129,5 @@ CAT3EXT =@CAT3EXT@
mv t.z $@
#
# End of "$Id: makeinclude.in,v 1.7.2.11.2.19 2002/06/28 21:04:35 easysw Exp $".
# End of "$Id: makeinclude.in,v 1.7.2.11.2.20 2002/07/14 17:03:30 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Group.cxx,v 1.8.2.8.2.15 2002/07/11 22:43:52 matthiaswm Exp $"
// "$Id: Fl_Group.cxx,v 1.8.2.8.2.16 2002/07/14 17:03:31 easysw Exp $"
//
// Group widget for the Fast Light Tool Kit (FLTK).
//
@ -49,11 +49,12 @@ int Fl_Group::find(const Fl_Widget* o) const {
return i;
}
// Kludge: Metrowerks CodeWarrior can't export static class member: current_
#ifdef __MWERKS__
// Metrowerks CodeWarrior and others can't export the static
// class member: current_, so these methods can't be inlined...
void Fl_Group::begin() {current_ = this;}
void Fl_Group::end() {current_ = (Fl_Group*)parent();}
#endif
Fl_Group *Fl_Group::current() {return current_;}
void Fl_Group::current(Fl_Group *g) {current_ = g;}
extern Fl_Widget* fl_oldfocus; // set by Fl::focus
@ -586,5 +587,5 @@ void Fl_Group::draw_outside_label(const Fl_Widget& w) const {
}
//
// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.15 2002/07/11 22:43:52 matthiaswm Exp $".
// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.16 2002/07/14 17:03:31 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.18.2.14.2.45 2002/06/28 21:04:37 easysw Exp $"
# "$Id: Makefile,v 1.18.2.14.2.46 2002/07/14 17:03:31 easysw Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
@ -198,9 +198,23 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
libfltk.so.1.1 libfltk.sl.1.1: $(OBJECTS)
libfltk.so.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
-$(RM) libfltk.so
$(LN) libfltk.so.1.1 libfltk.so
libfltk.sl.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
-$(RM) libfltk.sl
$(LN) libfltk.sl.1.1 libfltk.sl
libfltk.1.1.dylib: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
-$(RM) libfltk.dylib
$(LN) libfltk.1.1.dylib libfltk.dylib
libfltk_s.a: $(OBJECTS)
echo $(DSOCOMMAND) libfltk_s.o ...
@ -208,7 +222,7 @@ libfltk_s.a: $(OBJECTS)
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
-$(RM) $@
$(LIBCOMMAND) libfltk_s.a libfltk_s.o
chmod +x libfltk_s.a
$(CHMOD) +x libfltk_s.a
$(FLLIBNAME): $(FLOBJECTS)
echo $(LIBCOMMAND) $@ ...
@ -216,9 +230,23 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
libfltk_forms.so.1.1 libfltk_forms.sl.1.1: $(FLOBJECTS)
libfltk_forms.so.1.1: $(FLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS)
-$(RM) libfltk_forms.so
$(LN) libfltk_forms.so.1.1 libfltk_forms.so
libfltk_forms.sl.1.1: $(FLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS)
-$(RM) libfltk_forms.sl
$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
libfltk_forms.1.1.dylib: $(FLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS)
-$(RM) libfltk_forms.dylib
$(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib
libfltk_forms_s.a: $(FLOBJECTS)
echo $(DSOCOMMAND) libfltk_forms_s.o ...
@ -226,7 +254,7 @@ libfltk_forms_s.a: $(FLOBJECTS)
echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
-$(RM) $@
$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
chmod +x libfltk_forms_s.a
$(CHMOD) +x libfltk_forms_s.a
$(GLLIBNAME): $(GLOBJECTS)
echo $(LIBCOMMAND) $@ ...
@ -234,9 +262,23 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
libfltk_gl.so.1.1 libfltk_gl.sl.1.1: $(GLOBJECTS)
libfltk_gl.so.1.1: $(GLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS)
-$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.1 libfltk_gl.so
libfltk_gl.sl.1.1: $(GLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS)
-$(RM) libfltk_gl.sl
$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
libfltk_gl.1.1.dylib: $(GLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS)
-$(RM) libfltk_gl.dylib
$(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib
libfltk_gl_s.a: $(GLOBJECTS)
echo $(DSOCOMMAND) libfltk_gl_s.o ...
@ -244,7 +286,7 @@ libfltk_gl_s.a: $(GLOBJECTS)
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
-$(RM) $@
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
chmod +x libfltk_gl_s.a
$(CHMOD) +x libfltk_gl_s.a
$(IMGLIBNAME): $(IMGOBJECTS)
echo $(LIBCOMMAND) $@ ...
@ -252,9 +294,23 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
libfltk_images.so.1.1 libfltk_images.sl.1.1: $(IMGOBJECTS)
libfltk_images.so.1.1: $(IMGOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS)
-$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS)
-$(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.1 libfltk_images.sl
libfltk_images.1.1.dylib: $(IMGOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS)
-$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.1.dylib libfltk_images.dylib
libfltk_images_s.a: $(IMGOBJECTS)
echo $(DSOCOMMAND) libfltk_images_s.o ...
@ -262,14 +318,17 @@ libfltk_images_s.a: $(IMGOBJECTS)
echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
-$(RM) $@
$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
chmod +x libfltk_images_s.a
$(CHMOD) +x libfltk_images_s.a
clean :
-@ rm -f *.o $(DSONAME) $(FLDSONAME) $(GLDSONAME) \
-@ $(RM) *.o $(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)
depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(CFILES)
@ -343,9 +402,9 @@ install: $(LIBNAME) $(DSONAME) \
$(GLLIBNAME) $(GLDSONAME) \
$(IMGLIBNAME) $(IMGDSONAME)
echo "Installing libraries in $(libdir)..."
-mkdir -p $(libdir)
rm -f $(libdir)/$(LIBNAME)
-cp $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(libdir)
-$(MKDIR) $(libdir)
$(RM) $(libdir)/$(LIBNAME)
-$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(libdir)
$(RANLIB) $(libdir)/$(LIBNAME)
$(RANLIB) $(libdir)/$(FLLIBNAME)
if test x$(GLLIBNAME) != x; then \
@ -353,158 +412,158 @@ install: $(LIBNAME) $(DSONAME) \
fi
$(RANLIB) $(libdir)/$(IMGLIBNAME)
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;\
$(RM) $(libdir)/libfltk.so*;\
$(CP) libfltk.so.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk.so.1.1; \
$(LN) 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;\
$(RM) $(libdir)/libfltk.sl*;\
$(CP) libfltk.sl.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk.sl.1.1; \
$(LN) libfltk.sl.1.1 $(libdir)/libfltk.sl;\
fi
if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
rm -f $(libdir)/libfltk.*dylib;\
cp libfltk.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk.1.1.dylib; \
ln -s libfltk.1.1.dylib $(libdir)/libfltk.dylib;\
$(RM) $(libdir)/libfltk.*dylib;\
$(CP) libfltk.1.1.dylib $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk.1.1.dylib; \
$(LN) libfltk.1.1.dylib $(libdir)/libfltk.dylib;\
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; \
$(RM) $(libdir)/libfltk_s.a;\
$(CP) libfltk_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_s.a; \
fi
if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
rm -f $(libdir)/libfltk_forms.so*;\
cp libfltk_forms.so.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_forms.so.1.1; \
ln -s libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
$(RM) $(libdir)/libfltk_forms.so*;\
$(CP) libfltk_forms.so.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \
$(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
rm -f $(libdir)/libfltk_forms.sl*;\
cp libfltk_forms.sl.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_forms.sl.1.1; \
ln -s libfltk_forms.sl.1.1 $(libdir)/libfltk_forms.sl;\
$(RM) $(libdir)/libfltk_forms.sl*;\
$(CP) libfltk_forms.sl.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.sl.1.1; \
$(LN) libfltk_forms.sl.1.1 $(libdir)/libfltk_forms.sl;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
rm -f $(libdir)/libfltk_forms.*dylib;\
cp libfltk_forms.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk_forms.1.1.dylib; \
ln -s libfltk_forms.1.1.dylib $(libdir)/libfltk_forms.dylib;\
$(RM) $(libdir)/libfltk_forms.*dylib;\
$(CP) libfltk_forms.1.1.dylib $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.1.1.dylib; \
$(LN) libfltk_forms.1.1.dylib $(libdir)/libfltk_forms.dylib;\
fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
rm -f $(libdir)/libfltk_forms_s.a;\
cp libfltk_forms_s.a $(libdir); \
chmod 755 $(libdir)/libfltk_forms.a; \
$(RM) $(libdir)/libfltk_forms_s.a;\
$(CP) libfltk_forms_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.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;\
$(RM) $(libdir)/libfltk_gl.so*;\
$(CP) libfltk_gl.so.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \
$(LN) 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;\
$(RM) $(libdir)/libfltk_gl.sl*;\
$(CP) libfltk_gl.sl.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.sl.1.1; \
$(LN) libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\
fi
if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
rm -f $(libdir)/libfltk_gl.*dylib;\
cp libfltk_gl.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk_gl.1.1.dylib; \
ln -s libfltk_gl.1.1.dylib $(libdir)/libfltk_gl.dylib;\
$(RM) $(libdir)/libfltk_gl.*dylib;\
$(CP) libfltk_gl.1.1.dylib $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.1.1.dylib; \
$(LN) libfltk_gl.1.1.dylib $(libdir)/libfltk_gl.dylib;\
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; \
$(RM) $(libdir)/libfltk_gl_s.a;\
$(CP) libfltk_gl_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
fi
if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
rm -f $(libdir)/libfltk_images.so*;\
cp libfltk_images.so.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_images.so.1.1; \
ln -s libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
$(RM) $(libdir)/libfltk_images.so*;\
$(CP) libfltk_images.so.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \
$(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
rm -f $(libdir)/libfltk_images.sl*;\
cp libfltk_images.sl.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_images.sl.1.1; \
ln -s libfltk_images.sl.1.1 $(libdir)/libfltk_images.sl;\
$(RM) $(libdir)/libfltk_images.sl*;\
$(CP) libfltk_images.sl.1.1 $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_images.sl.1.1; \
$(LN) libfltk_images.sl.1.1 $(libdir)/libfltk_images.sl;\
fi
if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\
rm -f $(libdir)/libfltk_images.*dylib;\
cp libfltk_images.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk_images.1.1.dylib; \
ln -s libfltk_images.1.1.dylib $(libdir)/libfltk_images.dylib;\
$(RM) $(libdir)/libfltk_images.*dylib;\
$(CP) libfltk_images.1.1.dylib $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_images.1.1.dylib; \
$(LN) libfltk_images.1.1.dylib $(libdir)/libfltk_images.dylib;\
fi
if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
rm -f $(libdir)/libfltk_images_s.a;\
cp libfltk_images_s.a $(libdir); \
chmod 755 $(libdir)/libfltk_images.a; \
$(RM) $(libdir)/libfltk_images_s.a;\
$(CP) libfltk_images_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_images.a; \
fi
uninstall:
echo "Uninstalling libraries..."
rm -f $(libdir)/$(LIBNAME)
$(RM) $(libdir)/$(LIBNAME)
if test x$(DSONAME) = xlibfltk.so.1.1; then\
rm -f $(libdir)/libfltk.so*;\
$(RM) $(libdir)/libfltk.so*;\
fi
if test x$(DSONAME) = xlibfltk.sl.1.1; then\
rm -f $(libdir)/libfltk.sl*;\
$(RM) $(libdir)/libfltk.sl*;\
fi
if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
rm -f $(libdir)/libfltk.*dylib;\
$(RM) $(libdir)/libfltk.*dylib;\
fi
if test x$(DSONAME) = xlibfltk_s.a; then\
rm -f $(libdir)/libfltk_s.a;\
$(RM) $(libdir)/libfltk_s.a;\
fi
rm -f $(libdir)/$(FLLIBNAME);
$(RM) $(libdir)/$(FLLIBNAME);
if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
rm -f $(libdir)/libfltk_forms.so*;\
$(RM) $(libdir)/libfltk_forms.so*;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
rm -f $(libdir)/libfltk_forms.sl*;\
$(RM) $(libdir)/libfltk_forms.sl*;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
rm -f $(libdir)/libfltk_forms.*dylib;\
$(RM) $(libdir)/libfltk_forms.*dylib;\
fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
rm -f $(libdir)/libfltk_forms_s.a;\
$(RM) $(libdir)/libfltk_forms_s.a;\
fi
if test x$(GLLIBNAME) != x; then\
rm -f $(libdir)/$(GLLIBNAME);\
$(RM) $(libdir)/$(GLLIBNAME);\
fi
if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
rm -f $(libdir)/libfltk_gl.so*;\
$(RM) $(libdir)/libfltk_gl.so*;\
fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
rm -f $(libdir)/libfltk_gl.sl*;\
$(RM) $(libdir)/libfltk_gl.sl*;\
fi
if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
rm -f $(libdir)/libfltk_gl.*dylib;\
$(RM) $(libdir)/libfltk_gl.*dylib;\
fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
rm -f $(libdir)/libfltk_gl_s.a;\
$(RM) $(libdir)/libfltk_gl_s.a;\
fi
if test x$(IMGLIBNAME) != x; then\
rm -f $(libdir)/$(IMGLIBNAME);\
$(RM) $(libdir)/$(IMGLIBNAME);\
fi
if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
rm -f $(libdir)/libfltk_images.so*;\
$(RM) $(libdir)/libfltk_images.so*;\
fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
rm -f $(libdir)/libfltk_images.sl*;\
$(RM) $(libdir)/libfltk_images.sl*;\
fi
if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\
rm -f $(libdir)/libfltk_images.*dylib;\
$(RM) $(libdir)/libfltk_images.*dylib;\
fi
if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
rm -f $(libdir)/libfltk_images_s.a;\
$(RM) $(libdir)/libfltk_images_s.a;\
fi
#
# End of "$Id: Makefile,v 1.18.2.14.2.45 2002/06/28 21:04:37 easysw Exp $".
# End of "$Id: Makefile,v 1.18.2.14.2.46 2002/07/14 17:03:31 easysw Exp $".
#