mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename confusing configure and Makefile (makeinclude) variable.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10653 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2015-03-25 20:06:54 +00:00
parent b762768cff
commit f41be78153
5 changed files with 207 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cairo/Makefile
View File

@ -17,7 +17,7 @@
# #
# Note: see ../configure.in and/or ../makeinclude for definition of # Note: see ../configure.in and/or ../makeinclude for definition of
# FL_VERSION (x.y.z), FL_ABI_VERSION (x.y.0), and FL_API_VERSION (x.y) # FL_VERSION (x.y.z), FL_ABI_VERSION (x.y.0), and FL_DSO_VERSION (x.y)
FLTKFLAGS = -DFL_LIBRARY FLTKFLAGS = -DFL_LIBRARY
include ../makeinclude include ../makeinclude
@ -40,19 +40,19 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
$(LIBCOMMAND) $@ $(CAIROOBJECTS) $(LIBCOMMAND) $@ $(CAIROOBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk_cairo.so.$(FL_API_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_API_VERSION) libfltk_cairo.so.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
$(RM) libfltk_cairo.so $(RM) libfltk_cairo.so
$(LN) $(CAIRODSONAME) libfltk_cairo.so $(LN) $(CAIRODSONAME) libfltk_cairo.so
libfltk_cairo.sl.$(FL_API_VERSION): $(CAIROOBJECTS) ../src/libfltk.sl.$(FL_API_VERSION) libfltk_cairo.sl.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.sl.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
$(RM) libfltk_cairo.sl $(RM) libfltk_cairo.sl
$(LN) libfltk_cairo.sl.$(FL_API_VERSION) libfltk_cairo.sl $(LN) libfltk_cairo.sl.$(FL_DSO_VERSION) libfltk_cairo.sl
libfltk_cairo.$(FL_API_VERSION).dylib: $(CAIROOBJECTS) ../src/libfltk.$(FL_API_VERSION).dylib libfltk_cairo.$(FL_DSO_VERSION).dylib: $(CAIROOBJECTS) ../src/libfltk.$(FL_DSO_VERSION).dylib
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
@ -60,7 +60,7 @@ libfltk_cairo.$(FL_API_VERSION).dylib: $(CAIROOBJECTS) ../src/libfltk.$(FL_API_V
-compatibility_version $(FL_ABI_VERSION) \ -compatibility_version $(FL_ABI_VERSION) \
$(CAIROOBJECTS) -L../src $(LDLIBS) $(CAIROLIBS) -lfltk $(CAIROOBJECTS) -L../src $(LDLIBS) $(CAIROLIBS) -lfltk
$(RM) libfltk_cairo.dylib $(RM) libfltk_cairo.dylib
$(LN) libfltk_cairo.$(FL_API_VERSION).dylib libfltk_cairo.dylib $(LN) libfltk_cairo.$(FL_DSO_VERSION).dylib libfltk_cairo.dylib
libfltk_cairo_s.a: $(CAIROOBJECTS) libfltk_cairo_s.a: $(CAIROOBJECTS)
echo $(DSOCOMMAND) libfltk_cairo_s.o ... echo $(DSOCOMMAND) libfltk_cairo_s.o ...
@ -71,13 +71,13 @@ libfltk_cairo_s.a: $(CAIROOBJECTS)
$(CHMOD) +x src/libfltk_cairo_s.a $(CHMOD) +x src/libfltk_cairo_s.a
cygfltknox_cairo-$(FL_API_VERSION).dll: $(CAIROLIBNAME) ../src/cygfltknox-$(FL_API_VERSION).dll cygfltknox_cairo-$(FL_DSO_VERSION).dll: $(CAIROLIBNAME) ../src/cygfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(CAIROLIBNAME) ... echo $(DSOCOMMAND) $(CAIROLIBNAME) ...
$(DSOCOMMAND) $(CAIROLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(CAIROLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_cairo.dll.a \ -Wl,--out-implib=libfltk_cairo.dll.a \
-L../src -lfltk $(CAIROLIBS) $(LDLIBS) -L../src -lfltk $(CAIROLIBS) $(LDLIBS)
mgwfltknox_cairo-$(FL_API_VERSION).dll: $(CAIROLIBNAME) ../src/mgwfltknox-$(FL_API_VERSION).dll mgwfltknox_cairo-$(FL_DSO_VERSION).dll: $(CAIROLIBNAME) ../src/mgwfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(CAIROLIBNAME) ... echo $(DSOCOMMAND) $(CAIROLIBNAME) ...
$(DSOCOMMAND) $(CAIROLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(CAIROLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_cairo.dll.a \ -Wl,--out-implib=libfltk_cairo.dll.a \
@ -101,32 +101,32 @@ install: $(CAIROLIBNAME) $(CAIRODSONAME)
-$(INSTALL_DIR) $(DESTDIR)$(libdir) -$(INSTALL_DIR) $(DESTDIR)$(libdir)
$(INSTALL_LIB) $(CAIROLIBNAME) $(DESTDIR)$(libdir) $(INSTALL_LIB) $(CAIROLIBNAME) $(DESTDIR)$(libdir)
if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_API_VERSION); then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
$(INSTALL_LIB) libfltk_cairo.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.so;\ $(LN) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.so;\
fi fi
if test x$(CAIRODSONAME) = xsrc/libfltk_cairo.sl.$(FL_API_VERSION); then\ if test x$(CAIRODSONAME) = xsrc/libfltk_cairo.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\
$(INSTALL_LIB) libfltk_cairo.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.sl;\ $(LN) libfltk_cairo.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.sl;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_API_VERSION).dylib; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\
$(INSTALL_LIB) libfltk_cairo.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_cairo.dylib;\ $(LN) libfltk_cairo.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_cairo.dylib;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo_s.a; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo_s.a;\
$(INSTALL_LIB) libfltk_cairo_s.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo_s.a $(DESTDIR)$(libdir); \
fi fi
if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_API_VERSION).dll; then\ if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \
$(INSTALL_LIB) $(CAIRODSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(CAIRODSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\
$(INSTALL_LIB) libfltk_cairo.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_API_VERSION).dll; then\ if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \
$(INSTALL_LIB) $(CAIRODSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(CAIRODSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\
@ -141,23 +141,23 @@ uninstall:
if test x$(CAIROLIBNAME) != x; then\ if test x$(CAIROLIBNAME) != x; then\
$(RM) $(DESTDIR)$(libdir)/$(CAIROLIBNAME);\ $(RM) $(DESTDIR)$(libdir)/$(CAIROLIBNAME);\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_API_VERSION); then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.sl.$(FL_API_VERSION); then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_API_VERSION).dylib; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo_s.a; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo_s.a;\
fi fi
if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_API_VERSION).dll; then\ if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\
fi fi
if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_API_VERSION).dll; then\ if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(CAIRODSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.dll.a;\
fi fi

104
configure.in
View File

@ -58,14 +58,14 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1 FL_MAJOR_VERSION=1
FL_MINOR_VERSION=3 FL_MINOR_VERSION=3
FL_PATCH_VERSION=4 FL_PATCH_VERSION=4
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
AC_SUBST(FL_MAJOR_VERSION) AC_SUBST(FL_MAJOR_VERSION)
AC_SUBST(FL_MINOR_VERSION) AC_SUBST(FL_MINOR_VERSION)
AC_SUBST(FL_PATCH_VERSION) AC_SUBST(FL_PATCH_VERSION)
AC_SUBST(FL_API_VERSION) AC_SUBST(FL_DSO_VERSION)
AC_SUBST(FL_ABI_VERSION) AC_SUBST(FL_ABI_VERSION)
AC_SUBST(FL_VERSION) AC_SUBST(FL_VERSION)
@ -196,64 +196,64 @@ if test x$enable_shared = xyes; then
case $host_os in case $host_os in
darwin*) darwin*)
DSONAME="libfltk.$FL_API_VERSION.dylib" DSONAME="libfltk.$FL_DSO_VERSION.dylib"
FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib" FLDSONAME="libfltk_forms.$FL_DSO_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" GLDSONAME="libfltk_gl.$FL_DSO_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib" IMGDSONAME="libfltk_images.$FL_DSO_VERSION.dylib"
CAIRODSONAME="libfltk_cairo.$FL_API_VERSION.dylib" CAIRODSONAME="libfltk_cairo.$FL_DSO_VERSION.dylib"
DSOCOMMAND="\$(CXX) \$(ARCHFLAGS) \$(DSOFLAGS) -dynamiclib -lc -o" DSOCOMMAND="\$(CXX) \$(ARCHFLAGS) \$(DSOFLAGS) -dynamiclib -lc -o"
;; ;;
solaris*) solaris*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o"
if test "x$libdir" != "x/usr/lib"; then if test "x$libdir" != "x/usr/lib"; then
DSOLINK="-R$libdir" DSOLINK="-R$libdir"
fi fi
;; ;;
hpux*) hpux*)
DSONAME="libfltk.sl.$FL_API_VERSION" DSONAME="libfltk.sl.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.sl.$FL_API_VERSION" FLDSONAME="libfltk_forms.sl.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.sl.$FL_API_VERSION" GLDSONAME="libfltk_gl.sl.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.sl.$FL_API_VERSION" IMGDSONAME="libfltk_images.sl.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.sl.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.sl.$FL_DSO_VERSION"
DSOCOMMAND="ld \$(DSOFLAGS) -b -z +h \$@ $DEBUGFLAG -o" DSOCOMMAND="ld \$(DSOFLAGS) -b -z +h \$@ $DEBUGFLAG -o"
if test "x$libdir" != "x/usr/lib"; then if test "x$libdir" != "x/usr/lib"; then
DSOLINK="-Wl,-rpath,$libdir" DSOLINK="-Wl,-rpath,$libdir"
fi fi
;; ;;
irix*) irix*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then
DSOLINK="-Wl,-rpath,$libdir" DSOLINK="-Wl,-rpath,$libdir"
fi fi
;; ;;
osf*) osf*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then
DSOLINK="-Wl,-rpath,$libdir" DSOLINK="-Wl,-rpath,$libdir"
fi fi
;; ;;
linux* | *bsd*) linux* | *bsd*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
# See if the compiler supports -fvisibility... # See if the compiler supports -fvisibility...
@ -306,24 +306,24 @@ if test x$enable_shared = xyes; then
cygwin* | mingw*) cygwin* | mingw*)
PICFLAG=0 PICFLAG=0
if test x$enable_cygwin != xyes; then if test x$enable_cygwin != xyes; then
DSONAME="mgwfltknox-$FL_API_VERSION.dll" DSONAME="mgwfltknox-$FL_DSO_VERSION.dll"
FLDSONAME="mgwfltknox_forms-$FL_API_VERSION.dll" FLDSONAME="mgwfltknox_forms-$FL_DSO_VERSION.dll"
GLDSONAME="mgwfltknox_gl-$FL_API_VERSION.dll" GLDSONAME="mgwfltknox_gl-$FL_DSO_VERSION.dll"
IMGDSONAME="mgwfltknox_images-$FL_API_VERSION.dll" IMGDSONAME="mgwfltknox_images-$FL_DSO_VERSION.dll"
CAIRODSONAME="mgwfltknox_cairo-$FL_API_VERSION.dll" CAIRODSONAME="mgwfltknox_cairo-$FL_DSO_VERSION.dll"
else else
if test x$enable_x11 = xyes; then if test x$enable_x11 = xyes; then
DSONAME="cygfltk-$FL_API_VERSION.dll" DSONAME="cygfltk-$FL_DSO_VERSION.dll"
FLDSONAME="cygfltk_forms-$FL_API_VERSION.dll" FLDSONAME="cygfltk_forms-$FL_DSO_VERSION.dll"
GLDSONAME="cygfltk_gl-$FL_API_VERSION.dll" GLDSONAME="cygfltk_gl-$FL_DSO_VERSION.dll"
IMGDSONAME="cygfltk_images-$FL_API_VERSION.dll" IMGDSONAME="cygfltk_images-$FL_DSO_VERSION.dll"
CAIRODSONAME="cygfltk_cairo-$FL_API_VERSION.dll" CAIRODSONAME="cygfltk_cairo-$FL_DSO_VERSION.dll"
else else
DSONAME="cygfltknox-$FL_API_VERSION.dll" DSONAME="cygfltknox-$FL_DSO_VERSION.dll"
FLDSONAME="cygfltknox_forms-$FL_API_VERSION.dll" FLDSONAME="cygfltknox_forms-$FL_DSO_VERSION.dll"
GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll" GLDSONAME="cygfltknox_gl-$FL_DSO_VERSION.dll"
IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll" IMGDSONAME="cygfltknox_images-$FL_DSO_VERSION.dll"
CAIRODSONAME="cygfltknox_cairo-$FL_API_VERSION.dll" CAIRODSONAME="cygfltknox_cairo-$FL_DSO_VERSION.dll"
fi fi
fi fi
#----------------------------------------------------------- #-----------------------------------------------------------
@ -338,11 +338,11 @@ if test x$enable_shared = xyes; then
;; ;;
*) *)
AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.) AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_DSO_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" FLDSONAME="libfltk_forms.so.$FL_DSO_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
;; ;;
esac esac

48
fltk.list.in
View File

@ -58,31 +58,31 @@ $ZLIB=@ZLIB@
%system aix %system aix
f 0555 root sys $libdir/libfltk_s.a src/libfltk_s.a nostrip() f 0555 root sys $libdir/libfltk_s.a src/libfltk_s.a nostrip()
%system hpux %system hpux
f 0555 root sys $libdir/libfltk.sl.@FL_API_VERSION@ src/libfltk.sl.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk.sl.@FL_DSO_VERSION@ src/libfltk.sl.@FL_DSO_VERSION@ nostrip()
%system darwin %system darwin
f 0555 root sys $libdir/libfltk.@FL_API_VERSION@.dylib src/libfltk.@FL_API_VERSION@.dylib nostrip() f 0555 root sys $libdir/libfltk.@FL_DSO_VERSION@.dylib src/libfltk.@FL_DSO_VERSION@.dylib nostrip()
%system !aix !darwin !hpux %system !aix !darwin !hpux
f 0555 root sys $libdir/libfltk.so.@FL_API_VERSION@ src/libfltk.so.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk.so.@FL_DSO_VERSION@ src/libfltk.so.@FL_DSO_VERSION@ nostrip()
%system all %system all
%system aix %system aix
f 0555 root sys $libdir/libfltk_forms_s.a src/libfltk_forms_s.a nostrip() f 0555 root sys $libdir/libfltk_forms_s.a src/libfltk_forms_s.a nostrip()
%system hpux %system hpux
f 0555 root sys $libdir/libfltk_forms.sl.@FL_API_VERSION@ src/libfltk_forms.sl.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_forms.sl.@FL_DSO_VERSION@ src/libfltk_forms.sl.@FL_DSO_VERSION@ nostrip()
%system darwin %system darwin
f 0555 root sys $libdir/libfltk_forms.@FL_API_VERSION@.dylib src/libfltk_forms.@FL_API_VERSION@.dylib nostrip() f 0555 root sys $libdir/libfltk_forms.@FL_DSO_VERSION@.dylib src/libfltk_forms.@FL_DSO_VERSION@.dylib nostrip()
%system !aix !darwin !hpux %system !aix !darwin !hpux
f 0555 root sys $libdir/libfltk_forms.so.@FL_API_VERSION@ src/libfltk_forms.so.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_forms.so.@FL_DSO_VERSION@ src/libfltk_forms.so.@FL_DSO_VERSION@ nostrip()
%system all %system all
%system aix %system aix
f 0555 root sys $libdir/libfltk_images_s.a src/libfltk_images_s.a nostrip() f 0555 root sys $libdir/libfltk_images_s.a src/libfltk_images_s.a nostrip()
%system hpux %system hpux
f 0555 root sys $libdir/libfltk_images.sl.@FL_API_VERSION@ src/libfltk_images.sl.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_images.sl.@FL_DSO_VERSION@ src/libfltk_images.sl.@FL_DSO_VERSION@ nostrip()
%system darwin %system darwin
f 0555 root sys $libdir/libfltk_images.@FL_API_VERSION@.dylib src/libfltk_images.@FL_API_VERSION@.dylib nostrip() f 0555 root sys $libdir/libfltk_images.@FL_DSO_VERSION@.dylib src/libfltk_images.@FL_DSO_VERSION@.dylib nostrip()
%system !aix !darwin !hpux %system !aix !darwin !hpux
f 0555 root sys $libdir/libfltk_images.so.@FL_API_VERSION@ src/libfltk_images.so.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_images.so.@FL_DSO_VERSION@ src/libfltk_images.so.@FL_DSO_VERSION@ nostrip()
%system all %system all
%endif %endif
@ -90,11 +90,11 @@ f 0555 root sys $libdir/libfltk_images.so.@FL_API_VERSION@ src/libfltk_images.so
%system aix %system aix
f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a nostrip() f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a nostrip()
%system hpux %system hpux
f 0555 root sys $libdir/libfltk_gl.sl.@FL_API_VERSION@ src/libfltk_gl.sl.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_gl.sl.@FL_DSO_VERSION@ src/libfltk_gl.sl.@FL_DSO_VERSION@ nostrip()
%system darwin %system darwin
f 0555 root sys $libdir/libfltk_gl.@FL_API_VERSION@.dylib src/libfltk_gl.@FL_API_VERSION@.dylib nostrip() f 0555 root sys $libdir/libfltk_gl.@FL_DSO_VERSION@.dylib src/libfltk_gl.@FL_DSO_VERSION@.dylib nostrip()
%system !aix !darwin !hpux %system !aix !darwin !hpux
f 0555 root sys $libdir/libfltk_gl.so.@FL_API_VERSION@ src/libfltk_gl.so.@FL_API_VERSION@ nostrip() f 0555 root sys $libdir/libfltk_gl.so.@FL_DSO_VERSION@ src/libfltk_gl.so.@FL_DSO_VERSION@ nostrip()
%system all %system all
%endif %endif
@ -162,37 +162,37 @@ f 0444 root sys $libdir/libfltk_z.a lib/libfltk_z.a
%if DSONAME %if DSONAME
%system hpux %system hpux
l 0000 root sys $libdir/libfltk.sl libfltk.sl.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk.sl libfltk.sl.@FL_DSO_VERSION@
%system darwin %system darwin
l 0000 root sys $libdir/libfltk.dylib libfltk.@FL_API_VERSION@.dylib l 0000 root sys $libdir/libfltk.dylib libfltk.@FL_DSO_VERSION@.dylib
%system !aix !darwin !hpux %system !aix !darwin !hpux
l 0000 root sys $libdir/libfltk.so libfltk.so.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk.so libfltk.so.@FL_DSO_VERSION@
%system all %system all
%system hpux %system hpux
l 0000 root sys $libdir/libfltk_forms.sl libfltk_forms.sl.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_forms.sl libfltk_forms.sl.@FL_DSO_VERSION@
%system darwin %system darwin
l 0000 root sys $libdir/libfltk_forms.dylib libfltk_forms.@FL_API_VERSION@.dylib l 0000 root sys $libdir/libfltk_forms.dylib libfltk_forms.@FL_DSO_VERSION@.dylib
%system !aix !darwin !hpux %system !aix !darwin !hpux
l 0000 root sys $libdir/libfltk_forms.so libfltk_forms.so.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_forms.so libfltk_forms.so.@FL_DSO_VERSION@
%system all %system all
%system hpux %system hpux
l 0000 root sys $libdir/libfltk_images.sl libfltk_images.sl.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_images.sl libfltk_images.sl.@FL_DSO_VERSION@
%system darwin %system darwin
l 0000 root sys $libdir/libfltk_images.dylib libfltk_images.@FL_API_VERSION@.dylib l 0000 root sys $libdir/libfltk_images.dylib libfltk_images.@FL_DSO_VERSION@.dylib
%system !aix !darwin !hpux %system !aix !darwin !hpux
l 0000 root sys $libdir/libfltk_images.so libfltk_images.so.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_images.so libfltk_images.so.@FL_DSO_VERSION@
%system all %system all
%endif %endif
%if GLDSONAME %if GLDSONAME
%system hpux %system hpux
l 0000 root sys $libdir/libfltk_gl.sl libfltk_gl.sl.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_gl.sl libfltk_gl.sl.@FL_DSO_VERSION@
%system darwin %system darwin
l 0000 root sys $libdir/libfltk_gl.dylib libfltk_gl.@FL_API_VERSION@.dylib l 0000 root sys $libdir/libfltk_gl.dylib libfltk_gl.@FL_DSO_VERSION@.dylib
%system !aix !darwin !hpux %system !aix !darwin !hpux
l 0000 root sys $libdir/libfltk_gl.so libfltk_gl.so.@FL_API_VERSION@ l 0000 root sys $libdir/libfltk_gl.so libfltk_gl.so.@FL_DSO_VERSION@
%system all %system all
%endif %endif

2
makeinclude.in
View File

@ -22,7 +22,7 @@ FL_MAJOR_VERSION = @FL_MAJOR_VERSION@
FL_MINOR_VERSION = @FL_MINOR_VERSION@ FL_MINOR_VERSION = @FL_MINOR_VERSION@
FL_PATCH_VERSION = @FL_PATCH_VERSION@ FL_PATCH_VERSION = @FL_PATCH_VERSION@
FL_API_VERSION = @FL_API_VERSION@ FL_DSO_VERSION = @FL_DSO_VERSION@
FL_ABI_VERSION = @FL_ABI_VERSION@ FL_ABI_VERSION = @FL_ABI_VERSION@
FL_VERSION = @FL_VERSION@ FL_VERSION = @FL_VERSION@

212
src/Makefile
View File

@ -17,7 +17,7 @@
# #
# Note: see ../configure.in and/or ../makeinclude for definition of # Note: see ../configure.in and/or ../makeinclude for definition of
# FL_VERSION (x.y.z), FL_ABI_VERSION (x.y.0), and FL_API_VERSION (x.y) # FL_VERSION (x.y.z), FL_ABI_VERSION (x.y.0), and FL_DSO_VERSION (x.y)
CPPFILES = \ CPPFILES = \
Fl.cxx \ Fl.cxx \
@ -237,27 +237,27 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS) $(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk.so.$(FL_API_VERSION): $(OBJECTS) libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.so $(RM) libfltk.so
$(LN) libfltk.so.$(FL_API_VERSION) libfltk.so $(LN) libfltk.so.$(FL_DSO_VERSION) libfltk.so
libfltk.sl.$(FL_API_VERSION): $(OBJECTS) libfltk.sl.$(FL_DSO_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(DSOCOMMAND) $@ $(OBJECTS)
$(RM) libfltk.sl $(RM) libfltk.sl
$(LN) libfltk.sl.$(FL_API_VERSION) libfltk.sl $(LN) libfltk.sl.$(FL_DSO_VERSION) libfltk.sl
libfltk.$(FL_API_VERSION).dylib: $(OBJECTS) libfltk.$(FL_DSO_VERSION).dylib: $(OBJECTS)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
-current_version $(FL_VERSION) \ -current_version $(FL_VERSION) \
-compatibility_version $(FL_API_VERSION).0 \ -compatibility_version $(FL_DSO_VERSION).0 \
$(OBJECTS) $(LDLIBS) $(OBJECTS) $(LDLIBS)
$(RM) libfltk.dylib $(RM) libfltk.dylib
$(LN) libfltk.$(FL_API_VERSION).dylib libfltk.dylib $(LN) libfltk.$(FL_DSO_VERSION).dylib libfltk.dylib
libfltk_s.a: $(OBJECTS) libfltk_s.a: $(OBJECTS)
echo $(DSOCOMMAND) libfltk_s.o ... echo $(DSOCOMMAND) libfltk_s.o ...
@ -273,19 +273,19 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS) $(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk_forms.so.$(FL_API_VERSION): $(FLOBJECTS) libfltk.so.$(FL_API_VERSION) libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
$(RM) libfltk_forms.so $(RM) libfltk_forms.so
$(LN) libfltk_forms.so.$(FL_API_VERSION) libfltk_forms.so $(LN) libfltk_forms.so.$(FL_DSO_VERSION) libfltk_forms.so
libfltk_forms.sl.$(FL_API_VERSION): $(FLOBJECTS) libfltk.sl.$(FL_API_VERSION) libfltk_forms.sl.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.sl.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
$(RM) libfltk_forms.sl $(RM) libfltk_forms.sl
$(LN) libfltk_forms.sl.$(FL_API_VERSION) libfltk_forms.sl $(LN) libfltk_forms.sl.$(FL_DSO_VERSION) libfltk_forms.sl
libfltk_forms.$(FL_API_VERSION).dylib: $(FLOBJECTS) libfltk.$(FL_API_VERSION).dylib libfltk_forms.$(FL_DSO_VERSION).dylib: $(FLOBJECTS) libfltk.$(FL_DSO_VERSION).dylib
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
@ -293,7 +293,7 @@ libfltk_forms.$(FL_API_VERSION).dylib: $(FLOBJECTS) libfltk.$(FL_API_VERSION).dy
-compatibility_version $(FL_ABI_VERSION) \ -compatibility_version $(FL_ABI_VERSION) \
$(FLOBJECTS) -L. $(LDLIBS) -lfltk $(FLOBJECTS) -L. $(LDLIBS) -lfltk
$(RM) libfltk_forms.dylib $(RM) libfltk_forms.dylib
$(LN) libfltk_forms.$(FL_API_VERSION).dylib libfltk_forms.dylib $(LN) libfltk_forms.$(FL_DSO_VERSION).dylib libfltk_forms.dylib
libfltk_forms_s.a: $(FLOBJECTS) libfltk_forms_s.a: $(FLOBJECTS)
echo $(DSOCOMMAND) libfltk_forms_s.o ... echo $(DSOCOMMAND) libfltk_forms_s.o ...
@ -309,19 +309,19 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS) $(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk_gl.so.$(FL_API_VERSION): $(GLOBJECTS) libfltk.so.$(FL_API_VERSION) libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS) $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
$(RM) libfltk_gl.so $(RM) libfltk_gl.so
$(LN) libfltk_gl.so.$(FL_API_VERSION) libfltk_gl.so $(LN) libfltk_gl.so.$(FL_DSO_VERSION) libfltk_gl.so
libfltk_gl.sl.$(FL_API_VERSION): $(GLOBJECTS) libfltk.sl.$(FL_API_VERSION) libfltk_gl.sl.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.sl.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
$(RM) libfltk_gl.sl $(RM) libfltk_gl.sl
$(LN) libfltk_gl.sl.$(FL_API_VERSION) libfltk_gl.sl $(LN) libfltk_gl.sl.$(FL_DSO_VERSION) libfltk_gl.sl
libfltk_gl.$(FL_API_VERSION).dylib: $(GLOBJECTS) libfltk.$(FL_API_VERSION).dylib libfltk_gl.$(FL_DSO_VERSION).dylib: $(GLOBJECTS) libfltk.$(FL_DSO_VERSION).dylib
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
@ -329,7 +329,7 @@ libfltk_gl.$(FL_API_VERSION).dylib: $(GLOBJECTS) libfltk.$(FL_API_VERSION).dylib
-compatibility_version $(FL_ABI_VERSION) \ -compatibility_version $(FL_ABI_VERSION) \
$(GLOBJECTS) -L. $(GLDLIBS) -lfltk $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
$(RM) libfltk_gl.dylib $(RM) libfltk_gl.dylib
$(LN) libfltk_gl.$(FL_API_VERSION).dylib libfltk_gl.dylib $(LN) libfltk_gl.$(FL_DSO_VERSION).dylib libfltk_gl.dylib
libfltk_gl_s.a: $(GLOBJECTS) libfltk_gl_s.a: $(GLOBJECTS)
echo $(DSOCOMMAND) libfltk_gl_s.o ... echo $(DSOCOMMAND) libfltk_gl_s.o ...
@ -345,19 +345,19 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS) $(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk_images.so.$(FL_API_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_API_VERSION) libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
$(RM) libfltk_images.so $(RM) libfltk_images.so
$(LN) libfltk_images.so.$(FL_API_VERSION) libfltk_images.so $(LN) libfltk_images.so.$(FL_DSO_VERSION) libfltk_images.so
libfltk_images.sl.$(FL_API_VERSION): $(IMGOBJECTS) libfltk.sl.$(FL_API_VERSION) libfltk_images.sl.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.sl.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
$(RM) libfltk_images.sl $(RM) libfltk_images.sl
$(LN) libfltk_images.sl.$(FL_API_VERSION) libfltk_images.sl $(LN) libfltk_images.sl.$(FL_DSO_VERSION) libfltk_images.sl
libfltk_images.$(FL_API_VERSION).dylib: $(IMGOBJECTS) libfltk.$(FL_API_VERSION).dylib libfltk_images.$(FL_DSO_VERSION).dylib: $(IMGOBJECTS) libfltk.$(FL_DSO_VERSION).dylib
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
@ -365,7 +365,7 @@ libfltk_images.$(FL_API_VERSION).dylib: $(IMGOBJECTS) libfltk.$(FL_API_VERSION).
-compatibility_version $(FL_ABI_VERSION) \ -compatibility_version $(FL_ABI_VERSION) \
$(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
$(RM) libfltk_images.dylib $(RM) libfltk_images.dylib
$(LN) libfltk_images.$(FL_API_VERSION).dylib libfltk_images.dylib $(LN) libfltk_images.$(FL_DSO_VERSION).dylib libfltk_images.dylib
libfltk_images_s.a: $(IMGOBJECTS) libfltk_images_s.a: $(IMGOBJECTS)
echo $(DSOCOMMAND) libfltk_images_s.o ... echo $(DSOCOMMAND) libfltk_images_s.o ...
@ -387,24 +387,24 @@ libfltk_images_s.a: $(IMGOBJECTS)
# cygwin GDI shared libraries # cygwin GDI shared libraries
#----------------------------------------------------------------- #-----------------------------------------------------------------
cygfltknox-$(FL_API_VERSION).dll: $(LIBNAME) cygfltknox-$(FL_DSO_VERSION).dll: $(LIBNAME)
echo $(DSOCOMMAND) $(LIBNAME) ... echo $(DSOCOMMAND) $(LIBNAME) ...
$(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS) -Wl,--out-implib=libfltk.dll.a $(LDLIBS)
cygfltknox_forms-$(FL_API_VERSION).dll: $(FLLIBNAME) cygfltknox-$(FL_API_VERSION).dll cygfltknox_forms-$(FL_DSO_VERSION).dll: $(FLLIBNAME) cygfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(FLLIBNAME) ... echo $(DSOCOMMAND) $(FLLIBNAME) ...
$(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_forms.dll.a \ -Wl,--out-implib=libfltk_forms.dll.a \
-L. -lfltk $(LDLIBS) -L. -lfltk $(LDLIBS)
cygfltknox_gl-$(FL_API_VERSION).dll: $(GLLIBNAME) cygfltknox-$(FL_API_VERSION).dll cygfltknox_gl-$(FL_DSO_VERSION).dll: $(GLLIBNAME) cygfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(GLLIBNAME) ... echo $(DSOCOMMAND) $(GLLIBNAME) ...
$(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \ -Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS) -L. -lfltk $(GLDLIBS)
cygfltknox_images-$(FL_API_VERSION).dll: $(IMGLIBNAME) cygfltknox-$(FL_API_VERSION).dll cygfltknox_images-$(FL_DSO_VERSION).dll: $(IMGLIBNAME) cygfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(IMGLIBNAME) ... echo $(DSOCOMMAND) $(IMGLIBNAME) ...
$(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \ -Wl,--out-implib=libfltk_images.dll.a \
@ -415,42 +415,42 @@ cygfltknox_images-$(FL_API_VERSION).dll: $(IMGLIBNAME) cygfltknox-$(FL_API_VERSI
# cygwin X11 shared libraries # cygwin X11 shared libraries
#----------------------------------------------------------------- #-----------------------------------------------------------------
cygfltk-$(FL_API_VERSION).dll: $(LIBNAME) cygfltk-$(FL_DSO_VERSION).dll: $(LIBNAME)
echo $(DSOCOMMAND) $(LIBNAME) ... echo $(DSOCOMMAND) $(LIBNAME) ...
$(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS) -Wl,--out-implib=libfltk.dll.a $(LDLIBS)
cygfltk_forms-$(FL_API_VERSION).dll: $(FLLIBNAME) cygfltk-$(FL_API_VERSION).dll cygfltk_forms-$(FL_DSO_VERSION).dll: $(FLLIBNAME) cygfltk-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(FLLIBNAME) ... echo $(DSOCOMMAND) $(FLLIBNAME) ...
$(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_forms.dll.a \ -Wl,--out-implib=libfltk_forms.dll.a \
-L. -lfltk $(LDLIBS) -L. -lfltk $(LDLIBS)
cygfltk_gl-$(FL_API_VERSION).dll: $(GLLIBNAME) cygfltk-$(FL_API_VERSION).dll cygfltk_gl-$(FL_DSO_VERSION).dll: $(GLLIBNAME) cygfltk-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(GLLIBNAME) ... echo $(DSOCOMMAND) $(GLLIBNAME) ...
$(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \ -Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS) -L. -lfltk $(GLDLIBS)
cygfltk_images-$(FL_API_VERSION).dll: $(IMGLIBNAME) cygfltk-$(FL_API_VERSION).dll cygfltk_images-$(FL_DSO_VERSION).dll: $(IMGLIBNAME) cygfltk-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(IMGLIBNAME) ... echo $(DSOCOMMAND) $(IMGLIBNAME) ...
$(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \ -Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \ -L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS) $(IMAGELIBS) $(LDLIBS)
mgwfltknox-$(FL_API_VERSION).dll: $(LIBNAME) mgwfltknox-$(FL_DSO_VERSION).dll: $(LIBNAME)
echo $(DSOCOMMAND) $(LIBNAME) ... echo $(DSOCOMMAND) $(LIBNAME) ...
$(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS) -Wl,--out-implib=libfltk.dll.a $(LDLIBS)
mgwfltknox_forms-$(FL_API_VERSION).dll: $(FLLIBNAME) mgwfltknox-$(FL_API_VERSION).dll mgwfltknox_forms-$(FL_DSO_VERSION).dll: $(FLLIBNAME) mgwfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(FLLIBNAME) ... echo $(DSOCOMMAND) $(FLLIBNAME) ...
$(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(FLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_forms.dll.a \ -Wl,--out-implib=libfltk_forms.dll.a \
-L. -lfltk $(LDLIBS) -L. -lfltk $(LDLIBS)
mgwfltknox_gl-$(FL_API_VERSION).dll: $(GLLIBNAME) mgwfltknox-$(FL_API_VERSION).dll mgwfltknox_gl-$(FL_DSO_VERSION).dll: $(GLLIBNAME) mgwfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(GLLIBNAME) ... echo $(DSOCOMMAND) $(GLLIBNAME) ...
$(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(GLLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \ -Wl,--out-implib=libfltk_gl.dll.a \
@ -460,7 +460,7 @@ mgwfltknox_gl-$(FL_API_VERSION).dll: $(GLLIBNAME) mgwfltknox-$(FL_API_VERSION).d
# See STR #1585 for --exclude-libs # See STR #1585 for --exclude-libs
#----------------------------------------------------- #-----------------------------------------------------
mgwfltknox_images-$(FL_API_VERSION).dll: $(IMGLIBNAME) mgwfltknox-$(FL_API_VERSION).dll mgwfltknox_images-$(FL_DSO_VERSION).dll: $(IMGLIBNAME) mgwfltknox-$(FL_DSO_VERSION).dll
echo $(DSOCOMMAND) $(IMGLIBNAME) ... echo $(DSOCOMMAND) $(IMGLIBNAME) ...
$(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \ -Wl,--out-implib=libfltk_images.dll.a \
@ -571,125 +571,125 @@ install: $(LIBNAME) $(DSONAME) \
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
fi fi
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
if test x$(DSONAME) = xlibfltk.so.$(FL_API_VERSION); then\ if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
$(INSTALL_LIB) libfltk.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk.so;\ $(LN) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.so;\
fi fi
if test x$(DSONAME) = xlibfltk.sl.$(FL_API_VERSION); then\ if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
$(INSTALL_LIB) libfltk.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk.sl;\ $(LN) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.sl;\
fi fi
if test x$(DSONAME) = xlibfltk.$(FL_API_VERSION).dylib; then\ if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
$(INSTALL_LIB) libfltk.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir)/libfltk.dylib;\ $(LN) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk.dylib;\
fi fi
if test x$(DSONAME) = xlibfltk_s.a; then\ if test x$(DSONAME) = xlibfltk_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
fi fi
if test x$(DSONAME) = xcygfltknox-$(FL_API_VERSION).dll; then\ if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(DSONAME) = xmgwfltknox-$(FL_API_VERSION).dll; then\ if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_API_VERSION); then\ if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
$(INSTALL_LIB) libfltk_forms.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_forms.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\ $(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_API_VERSION); then\ if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
$(INSTALL_LIB) libfltk_forms.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_forms.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.sl;\ $(LN) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.sl;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.$(FL_API_VERSION).dylib; then\ if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
$(INSTALL_LIB) libfltk_forms.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_forms.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\ $(LN) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
$(INSTALL_LIB) libfltk_forms_s.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms_s.a $(DESTDIR)$(libdir); \
fi fi
if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_API_VERSION).dll; then\ if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\
$(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
$(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_API_VERSION).dll; then\ if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\
$(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
$(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_API_VERSION); then\ if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
$(INSTALL_LIB) libfltk_gl.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so;\ $(LN) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_API_VERSION); then\ if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
$(INSTALL_LIB) libfltk_gl.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.sl;\ $(LN) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.sl;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.$(FL_API_VERSION).dylib; then\ if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
$(INSTALL_LIB) libfltk_gl.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\ $(LN) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
$(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \
fi fi
if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_API_VERSION).dll; then\ if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\
$(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_API_VERSION).dll; then\ if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\
$(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_API_VERSION); then\ if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
$(INSTALL_LIB) libfltk_images.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_images.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so;\ $(LN) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_API_VERSION); then\ if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
$(INSTALL_LIB) libfltk_images.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_images.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_images.sl;\ $(LN) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.sl;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.$(FL_API_VERSION).dylib; then\ if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
$(INSTALL_LIB) libfltk_images.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_images.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\ $(LN) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
$(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \
fi fi
if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_API_VERSION).dll; then\ if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
$(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
fi fi
if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_API_VERSION).dll; then\ if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
$(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
@ -700,106 +700,106 @@ install: $(LIBNAME) $(DSONAME) \
uninstall: uninstall:
echo "Uninstalling libraries..." echo "Uninstalling libraries..."
$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME) $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
if test x$(DSONAME) = xlibfltk.so.$(FL_API_VERSION); then\ if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
fi fi
if test x$(DSONAME) = xlibfltk.sl.$(FL_API_VERSION); then\ if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
fi fi
if test x$(DSONAME) = xlibfltk.$(FL_API_VERSION).dylib; then\ if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
fi fi
if test x$(DSONAME) = xlibfltk_s.a; then\ if test x$(DSONAME) = xlibfltk_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
fi fi
if test x$(DSONAME) = xcygfltknox-$(FL_API_VERSION).dll; then\ if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi fi
if test x$(DSONAME) = xcygfltk-$(FL_API_VERSION).dll; then\ if test x$(DSONAME) = xcygfltk-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi fi
if test x$(DSONAME) = xmgwfltknox-$(FL_API_VERSION).dll; then\ if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi fi
$(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME); $(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME);
if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_API_VERSION); then\ if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_API_VERSION); then\ if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.$(FL_API_VERSION).dylib; then\ if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
fi fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
fi fi
if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_API_VERSION).dll; then\ if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
fi fi
if test x$(FLDSONAME) = xcygfltk_forms-$(FL_API_VERSION).dll; then\ if test x$(FLDSONAME) = xcygfltk_forms-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
fi fi
if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_API_VERSION).dll; then\ if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
fi fi
if test x$(GLLIBNAME) != x; then\ if test x$(GLLIBNAME) != x; then\
$(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\ $(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_API_VERSION); then\ if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_API_VERSION); then\ if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.$(FL_API_VERSION).dylib; then\ if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
fi fi
if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_API_VERSION).dll; then\ if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi fi
if test x$(GLDSONAME) = xcygfltk_gl-$(FL_API_VERSION).dll; then\ if test x$(GLDSONAME) = xcygfltk_gl-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi fi
if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_API_VERSION).dll; then\ if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi fi
if test x$(IMGLIBNAME) != x; then\ if test x$(IMGLIBNAME) != x; then\
$(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\ $(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_API_VERSION); then\ if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_API_VERSION); then\ if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images.$(FL_API_VERSION).dylib; then\ if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
fi fi
if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
fi fi
if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_API_VERSION).dll; then\ if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi fi
if test x$(IMGDSONAME) = xcygfltk_images-$(FL_API_VERSION).dll; then\ if test x$(IMGDSONAME) = xcygfltk_images-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi fi
if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_API_VERSION).dll; then\ if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi fi