| |
Author: matt
Date: 2011-08-22 10:27:33 -0700 (Mon, 22 Aug 2011)
New Revision: 8993
Log:
FLTK3: fixed the creation of the autoconf/Makefile system to compile correctly on OSX/commandline.
Modified:
branches/branch-3.0/configure.in
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/Makefile
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/makeinclude.in
branches/branch-3.0/src/Makefile
branches/branch-3.0/test/Makefile
Modified: branches/branch-3.0/configure.in
===================================================================
--- branches/branch-3.0/configure.in 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/configure.in 2011-08-22 17:27:33 UTC (rev 8993)
@@ -826,9 +826,9 @@
AC_DEFINE(HAVE_GL_GLU_H)
GLLIB="-lglu32 $GLLIB")
else
- LINK_FLTK_GL=""
- FLTK_GL_LIBNAME=""
- FLTK_GL_DSONAME=""
+ LINK_FLTK3GL=""
+ FLTK3GL_LIBNAME=""
+ FLTK3GL_DSONAME=""
GLDEMOS=""
fi
@@ -860,9 +860,9 @@
AC_DEFINE(HAVE_GL_GLU_H)
GLLIB="-framework AGL -framework OpenGL -framework ApplicationServices"
else
- LINK_FLTK_GL=""
- FLTK_GL_LIBNAME=""
- FLTK_GL_DSONAME=""
+ LINK_FLTK3GL=""
+ FLTK3GL_LIBNAME=""
+ FLTK3GL_DSONAME=""
GLDEMOS=""
fi
@@ -932,15 +932,15 @@
)
if test x$ac_cv_lib_GL_glXMakeCurrent != xyes -a x$ac_cv_lib_MesaGL_glXMakeCurrent != xyes; then
- LINK_FLTK_GL=""
- FLTK_GL_LIBNAME=""
- FLTK_GL_DSONAME=""
+ LINK_FLTK3GL=""
+ FLTK3GL_LIBNAME=""
+ FLTK3GL_DSONAME=""
GLDEMOS=""
fi
else
- LINK_FLTK_GL=""
- FLTK_GL_LIBNAME=""
- FLTK_GL_DSONAME=""
+ LINK_FLTK3GL=""
+ FLTK3GL_LIBNAME=""
+ FLTK3GL_DSONAME=""
GLDEMOS=""
fi
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/fltk.flw 2011-08-22 17:27:33 UTC (rev 8993)
@@ -12,7 +12,7 @@
uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
uuid_VC2008_Workspace {D21EA206-7BBC-4F5B-8518-A798E56EE0FC}
uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
- build_env 64
+ build_env 1
} {
folder Applications {open
uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
Modified: branches/branch-3.0/fluid/Makefile
===================================================================
--- branches/branch-3.0/fluid/Makefile 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/fluid/Makefile 2011-08-22 17:27:33 UTC (rev 8993)
@@ -76,7 +76,7 @@
-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
depend: $(FLUID_CPPFILES)
- makedepend -Y -I.. -f makedepend $(FLUID_CPPFILES)
+ makedepend -Y -I../include -f makedepend $(FLUID_CPPFILES)
# Automatically generated dependencies...
include makedepend
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/fluid/file_make.cxx 2011-08-22 17:27:33 UTC (rev 8993)
@@ -196,7 +196,7 @@
fprintf(out, "IMAGELIBS\t= -L../lib @IMAGELIBS@\n");
fprintf(out, "\n");
fprintf(out, "# image libraries to build...\n");
- fprintf(out, "IMAGEDIRS\t= @JPEG@ @ZLIB@ @PNG@\n");
+ fprintf(out, "IMAGEDIRS\t= \n");
fprintf(out, "# The extension to use for executables...\n");
fprintf(out, "EXEEXT\t\t= @EXEEXT@\n");
fprintf(out, "\n");
@@ -240,19 +240,19 @@
fprintf(out, "\n");
fprintf(out, ".o$(EXEEXT):\n");
fprintf(out, "\techo Linking $@...\n");
- fprintf(out, "\t$(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINK_FLTK) $(LDLIBS) -o $@\n");
+ fprintf(out, "\t$(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINK_FLTK3) $(LDLIBS) -o $@\n");
fprintf(out, "\n");
fprintf(out, ".c.o:\n");
fprintf(out, "\techo Compiling $<...\n");
- fprintf(out, "\t$(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@\n");
+ fprintf(out, "\t$(CC) -I../include $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@\n");
fprintf(out, "\n");
fprintf(out, ".cxx.o:\n");
fprintf(out, "\techo Compiling $<...\n");
- fprintf(out, "\t$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@\n");
+ fprintf(out, "\t$(CXX) -I../include $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@\n");
fprintf(out, "\t\n");
fprintf(out, ".mm.o:\n");
fprintf(out, "\techo Compiling $<...\n");
- fprintf(out, "\t$(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@\n");
+ fprintf(out, "\t$(CXX) -I../include $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@\n");
fprintf(out, "\n");
fprintf(out, "\n");
fprintf(out, ".man.0 .man.1 .man.3 .man.6:\n");
@@ -281,7 +281,7 @@
fprintf(out, "AC_PREREQ(2.50)\n");
fprintf(out, "\n");
fprintf(out, "dnl Required file in package...\n");
- fprintf(out, "AC_INIT(src/Fl.cxx)\n");
+ fprintf(out, "AC_INIT(src/core/Fl.cxx)\n");
fprintf(out, "\n");
fprintf(out, "dnl So --with-archflags option is used during \"checking size of long\"\n");
fprintf(out, "if test `uname` = Darwin; then\n");
@@ -841,7 +841,7 @@
fprintf(out, "# Handle the JPEG lib linking mode (use fltk local or system lib)\n");
fprintf(out, "# If --enable-(resp. --disable-)localjpeg parameter is not set by user\n");
fprintf(out, "# Then we check the JPEG lib usability, with result in sysjpeglib_ok variable\n");
- fprintf(out, "AC_ARG_ENABLE(localjpeg, [ --enable-localjpeg use local JPEG library, default=auto])\n");
+ fprintf(out, "AC_ARG_ENABLE(localjpeg, [ --enable-localjpeg use local JPEG library, default=yes])\n");
fprintf(out, "# Check for System lib use if automatic mode or --disable-localjpeg is requested\n");
fprintf(out, "sysjpeglib_ok=no\n");
fprintf(out, "sysjpeginc_ok=no\n");
@@ -855,10 +855,10 @@
fprintf(out, "fi\n");
fprintf(out, "# Now set the jpeg lib and include flags according to the requested mode and availability \n");
fprintf(out, "if test x$enable_localjpeg = xyes -o x$sysjpeglib_ok = xno; then\n");
- fprintf(out, " JPEGINC=\"-I../jpeg\"\n");
+ fprintf(out, " JPEGINC=\"-I../include/fltk3jpeg\"\n");
fprintf(out, " JPEG=\"jpeg\"\n");
- fprintf(out, " IMAGELIBS=\"-lfltk_jpeg $IMAGELIBS\"\n");
- fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk_jpeg.a $STATICIMAGELIBS\"\n");
+ fprintf(out, " IMAGELIBS=\"-lfltk3jpeg $IMAGELIBS\"\n");
+ fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk3jpeg.a $STATICIMAGELIBS\"\n");
fprintf(out, " AC_DEFINE(HAVE_LIBJPEG)\n");
fprintf(out, " #ac_cv_lib_jpeg_jpeg_CreateCompress=no # from ima: should not be necessary\n");
fprintf(out, " # Finally, warn user if system lib was requested but not found\n");
@@ -876,7 +876,7 @@
fprintf(out, "# Handle the ZLIB lib linking mode (use fltk local or system lib)\n");
fprintf(out, "# If --enable-(resp. --disable-)localzlib parameter is not set by user\n");
fprintf(out, "# Then we check the ZLIB lib usability, with result in syszlib_ok variable\n");
- fprintf(out, "AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto])\n");
+ fprintf(out, "AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=yes])\n");
fprintf(out, "# Check for System lib use if automatic mode or --disable-localzlib is requested\n");
fprintf(out, "syszlib_ok=no\n");
fprintf(out, "syszinc_ok=no\n");
@@ -890,11 +890,11 @@
fprintf(out, "fi\n");
fprintf(out, "# Now set the Z lib and include flags according to the requested mode and availability \n");
fprintf(out, "if test x$enable_localzlib = xyes -o x$syszlib_ok = xno ; then\n");
- fprintf(out, " ZLIBINC=\"-I../zlib\"\n");
+ fprintf(out, " ZLIBINC=\"-I../include/fltk3zlib\"\n");
fprintf(out, " ZLIB=\"zlib\"\n");
- fprintf(out, " LIBS=\"-lfltk_zlib $LIBS\"\n");
- fprintf(out, " IMAGELIBS=\"-lfltk_zlib $IMAGELIBS\"\n");
- fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk_zlib.a $STATICIMAGELIBS\"\n");
+ fprintf(out, " LIBS=\"-lfltk3zlib $LIBS\"\n");
+ fprintf(out, " IMAGELIBS=\"-lfltk3zlib $IMAGELIBS\"\n");
+ fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk3zlib.a $STATICIMAGELIBS\"\n");
fprintf(out, " AC_DEFINE(HAVE_LIBZ)\n");
fprintf(out, " ac_cv_lib_z_gzgets=no # fc: is still necessary ?\n");
fprintf(out, " # Finally, warn user if system lib was requested but not found\n");
@@ -913,7 +913,7 @@
fprintf(out, "# Handle the PNG lib linking mode (use fltk local or system lib)\n");
fprintf(out, "# If --enable-(resp. --disable-)localpng parameter is not set by user\n");
fprintf(out, "# Then we check the png lib usability with result in syspng_lib variable\n");
- fprintf(out, "AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto])\n");
+ fprintf(out, "AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=yes])\n");
fprintf(out, "\n");
fprintf(out, "# Now check if system lib is usable, we check Lib AND include availability with inc variant,\n");
fprintf(out, "# but only, if the builtin lib is not requested\n");
@@ -934,10 +934,10 @@
fprintf(out, "\n");
fprintf(out, "# The following is executed if the lib was not found usable or if local lib is required explicitly\n");
fprintf(out, "if test x$enable_localpng = xyes -o x$syspnglib_ok = xno ; then\n");
- fprintf(out, " PNGINC=\"-I../png\"\n");
+ fprintf(out, " PNGINC=\"-I../include/fltk3png\"\n");
fprintf(out, " PNG=\"png\"\n");
- fprintf(out, " IMAGELIBS=\"-lfltk_png $IMAGELIBS\"\n");
- fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk_png.a $STATICIMAGELIBS\"\n");
+ fprintf(out, " IMAGELIBS=\"-lfltk3png $IMAGELIBS\"\n");
+ fprintf(out, " STATICIMAGELIBS=\"\\$libdir/libfltk3png.a $STATICIMAGELIBS\"\n");
fprintf(out, " AC_DEFINE(HAVE_LIBPNG)\n");
fprintf(out, " AC_DEFINE(HAVE_PNG_H)\n");
fprintf(out, " AC_DEFINE(HAVE_PNG_GET_VALID)\n");
@@ -1057,9 +1057,9 @@
fprintf(out, " AC_DEFINE(HAVE_GL_GLU_H)\n");
fprintf(out, " GLLIB=\"-lglu32 $GLLIB\")\n");
fprintf(out, " else\n");
- fprintf(out, " LINK_FLTK_GL=\"\"\n");
- fprintf(out, " FLTK_GL_LIBNAME=\"\"\n");
- fprintf(out, " FLTK_GL_DSONAME=\"\"\n");
+ fprintf(out, " LINK_FLTK3GL=\"\"\n");
+ fprintf(out, " FLTK3GL_LIBNAME=\"\"\n");
+ fprintf(out, " FLTK3GL_DSONAME=\"\"\n");
fprintf(out, " GLDEMOS=\"\"\n");
fprintf(out, " fi\n");
fprintf(out, "\n");
@@ -1091,9 +1091,9 @@
fprintf(out, " AC_DEFINE(HAVE_GL_GLU_H)\n");
fprintf(out, " GLLIB=\"-framework AGL -framework OpenGL -framework ApplicationServices\"\n");
fprintf(out, " else\n");
- fprintf(out, " LINK_FLTK_GL=\"\"\n");
- fprintf(out, " FLTK_GL_LIBNAME=\"\"\n");
- fprintf(out, " FLTK_GL_DSONAME=\"\"\n");
+ fprintf(out, " LINK_FLTK3GL=\"\"\n");
+ fprintf(out, " FLTK3GL_LIBNAME=\"\"\n");
+ fprintf(out, " FLTK3GL_DSONAME=\"\"\n");
fprintf(out, " GLDEMOS=\"\"\n");
fprintf(out, " fi\n");
fprintf(out, "\n");
@@ -1163,15 +1163,15 @@
fprintf(out, " )\n");
fprintf(out, "\n");
fprintf(out, " if test x$ac_cv_lib_GL_glXMakeCurrent != xyes -a x$ac_cv_lib_MesaGL_glXMakeCurrent != xyes; then\n");
- fprintf(out, " LINK_FLTK_GL=\"\"\n");
- fprintf(out, " FLTK_GL_LIBNAME=\"\"\n");
- fprintf(out, " FLTK_GL_DSONAME=\"\"\n");
+ fprintf(out, " LINK_FLTK3GL=\"\"\n");
+ fprintf(out, " FLTK3GL_LIBNAME=\"\"\n");
+ fprintf(out, " FLTK3GL_DSONAME=\"\"\n");
fprintf(out, " GLDEMOS=\"\"\n");
fprintf(out, " fi\n");
fprintf(out, " else\n");
- fprintf(out, " LINK_FLTK_GL=\"\"\n");
- fprintf(out, " FLTK_GL_LIBNAME=\"\"\n");
- fprintf(out, " FLTK_GL_DSONAME=\"\"\n");
+ fprintf(out, " LINK_FLTK3GL=\"\"\n");
+ fprintf(out, " FLTK3GL_LIBNAME=\"\"\n");
+ fprintf(out, " FLTK3GL_DSONAME=\"\"\n");
fprintf(out, " GLDEMOS=\"\"\n");
fprintf(out, " fi\n");
fprintf(out, "\n");
@@ -1602,7 +1602,7 @@
fprintf(out, "\n");
fprintf(out, "dnl Write all of the files...\n");
fprintf(out, "AC_CONFIG_HEADER(config.h:configh.in)\n");
- fprintf(out, "AC_OUTPUT(makeinclude fltk.list fltk-config fltk.spec FL/Makefile)\n");
+ fprintf(out, "AC_OUTPUT(makeinclude fltk.list fltk-config fltk.spec include/fltk3/Makefile)\n");
fprintf(out, "\n");
fprintf(out, "dnl Make sure the fltk-config script is executable...\n");
fprintf(out, "chmod +x fltk-config\n");
@@ -1647,7 +1647,7 @@
}
fprintf(out, "\n");
fprintf(out, "\techo Linking $@...\n");
- fprintf(out, "\t$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLUID_OBJECTS) $(LINK_FLTK_IMAGES) $(LINK_FLTK_PNG) $(LINK_FLTK_JPEG) $(LINK_FLTK_ZLIB) $(LINK_FLTK) $(LDLIBS)\n");
+ fprintf(out, "\t$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLUID_OBJECTS) $(LINK_FLTK3IMAGES) $(LINK_FLTK3PNG) $(LINK_FLTK3JPEG) $(LINK_FLTK3ZLIB) $(LINK_FLTK3) $(LDLIBS)\n");
fprintf(out, "\t$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS\n");
fprintf(out, "\n");
fprintf(out, "fluid-shared$(EXEEXT):\t$(FLUID_OBJECTS)");
@@ -1667,7 +1667,7 @@
fprintf(out, "\t-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)\n");
fprintf(out, "\n");
fprintf(out, "depend:\t$(FLUID_CPPFILES)\n");
- fprintf(out, "\tmakedepend -Y -I.. -f makedepend $(FLUID_CPPFILES)\n");
+ fprintf(out, "\tmakedepend -Y -I../include -f makedepend $(FLUID_CPPFILES)\n");
fprintf(out, "\n");
fprintf(out, "# Automatically generated dependencies...\n");
fprintf(out, "include makedepend\n");
@@ -1819,109 +1819,118 @@
}
fprintf(out, "\n\n");
- fprintf(out, "$(FLTK_LIBNAME): $(FLTK_OBJECTS)\n");
- fprintf(out, "\techo $(LIBCOMMAND) $@ ...\n");
- fprintf(out, "\t$(RM) $@\n");
- fprintf(out, "\t$(LIBCOMMAND) $@ $(FLTK_OBJECTS)\n");
- fprintf(out, "\t$(RANLIB) $@\n");
- fprintf(out, "\n");
- fprintf(out, "libfltk.so.1.3: $(FLTK_OBJECTS)\n");
+ for (tgt = first_target; tgt; tgt = tgt->next_target(workspace)) {
+ if (tgt->builds_in(FL_ENV_MAKE) && strcmp(tgt->makefile_path(), path)==0) {
+ fprintf(out, "$(%s_LIBNAME): $(%s_OBJECTS)\n", tgt->caps_name(), tgt->caps_name());
+ fprintf(out, "\techo $(LIBCOMMAND) $@ ...\n");
+ fprintf(out, "\t$(RM) $@\n");
+ fprintf(out, "\t$(LIBCOMMAND) $@ $(%s_OBJECTS)\n", tgt->caps_name());
+ fprintf(out, "\t$(RANLIB) $@\n");
+ fprintf(out, "\n");
+ }
+ }
+
+ fprintf(out, "libfltk.so.1.3: $(FLTK3_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_OBJECTS)\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3_OBJECTS)\n");
fprintf(out, "\t$(RM) libfltk.so\n");
fprintf(out, "\t$(LN) libfltk.so.1.3 libfltk.so\n");
fprintf(out, "\n");
- fprintf(out, "libfltk.sl.1.3: $(FLTK_OBJECTS)\n");
+ fprintf(out, "libfltk.sl.1.3: $(FLTK3_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_OBJECTS)\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3_OBJECTS)\n");
fprintf(out, "\t$(RM) libfltk.sl\n");
fprintf(out, "\t$(LN) libfltk.sl.1.3 libfltk.sl\n");
fprintf(out, "\n");
- fprintf(out, "libfltk.1.3.dylib: $(FLTK_OBJECTS)\n");
+ fprintf(out, "libfltk.1.3.dylib: $(FLTK3_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
fprintf(out, "\t$(DSOCOMMAND) $@ \\\n");
fprintf(out, "\t\t-install_name $(libdir)/$@ \\\n");
fprintf(out, "\t\t-current_version 1.3.0 \\\n");
fprintf(out, "\t\t-compatibility_version 1.3.0 \\\n");
- fprintf(out, "\t\t$(FLTK_OBJECTS) $(LDLIBS)\n");
+ fprintf(out, "\t\t$(FLTK3_OBJECTS) $(LDLIBS)\n");
fprintf(out, "\t$(RM) libfltk.dylib\n");
fprintf(out, "\t$(LN) libfltk.1.3.dylib libfltk.dylib\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_s.a: $(FLTK_OBJECTS)\n");
+ fprintf(out, "libfltk_s.a: $(FLTK3_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) libfltk_s.o ...\n");
- fprintf(out, "\t$(DSOCOMMAND) libfltk_s.o $(FLTK_OBJECTS) $(IMAGELIBS)\n");
+ fprintf(out, "\t$(DSOCOMMAND) libfltk_s.o $(FLTK3_OBJECTS) $(IMAGELIBS)\n");
fprintf(out, "\techo $(LIBCOMMAND) libfltk_s.a libfltk_s.o\n");
fprintf(out, "\t$(RM) $@\n");
fprintf(out, "\t$(LIBCOMMAND) libfltk_s.a libfltk_s.o\n");
fprintf(out, "\t$(CHMOD) +x libfltk_s.a\n");
fprintf(out, "\n");
- fprintf(out, "$(FLTK_GL_LIBNAME): $(FLTK_GL_OBJECTS)\n");
+ /*
+ fprintf(out, "$(FLTK3GL_LIBNAME): $(FLTK3GL_OBJECTS)\n");
fprintf(out, "\techo $(LIBCOMMAND) $@ ...\n");
fprintf(out, "\t$(RM) $@\n");
- fprintf(out, "\t$(LIBCOMMAND) $@ $(FLTK_GL_OBJECTS)\n");
+ fprintf(out, "\t$(LIBCOMMAND) $@ $(FLTK3GL_OBJECTS)\n");
fprintf(out, "\t$(RANLIB) $@\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_gl.so.1.3: $(FLTK_GL_OBJECTS) libfltk.so.1.3\n");
+ */
+ fprintf(out, "libfltk_gl.so.1.3: $(FLTK3GL_OBJECTS) libfltk.so.1.3\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_GL_OBJECTS) -L. -lfltk\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3GL_OBJECTS) -L. -lfltk\n");
fprintf(out, "\t$(RM) libfltk_gl.so\n");
fprintf(out, "\t$(LN) libfltk_gl.so.1.3 libfltk_gl.so\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_gl.sl.1.3: $(FLTK_GL_OBJECTS) libfltk.sl.1.3\n");
+ fprintf(out, "libfltk_gl.sl.1.3: $(FLTK3GL_OBJECTS) libfltk.sl.1.3\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_GL_OBJECTS) -L. -lfltk\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3GL_OBJECTS) -L. -lfltk\n");
fprintf(out, "\t$(RM) libfltk_gl.sl\n");
fprintf(out, "\t$(LN) libfltk_gl.sl.1.3 libfltk_gl.sl\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_gl.1.3.dylib: $(FLTK_GL_OBJECTS) libfltk.1.3.dylib\n");
+ fprintf(out, "libfltk_gl.1.3.dylib: $(FLTK3GL_OBJECTS) libfltk.1.3.dylib\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
fprintf(out, "\t$(DSOCOMMAND) $@ \\\n");
fprintf(out, "\t\t-install_name $(libdir)/$@ \\\n");
fprintf(out, "\t\t-current_version 1.3.0 \\\n");
fprintf(out, "\t\t-compatibility_version 1.3.0 \\\n");
- fprintf(out, "\t\t$(FLTK_GL_OBJECTS) -L. $(GLDLIBS) -lfltk\n");
+ fprintf(out, "\t\t$(FLTK3GL_OBJECTS) -L. $(GLDLIBS) -lfltk\n");
fprintf(out, "\t$(RM) libfltk_gl.dylib\n");
fprintf(out, "\t$(LN) libfltk_gl.1.3.dylib libfltk_gl.dylib\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_gl_s.a: $(FLTK_GL_OBJECTS)\n");
+ fprintf(out, "libfltk_gl_s.a: $(FLTK3GL_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) libfltk_gl_s.o ...\n");
- fprintf(out, "\t$(DSOCOMMAND) libfltk_gl_s.o $(FLTK_GL_OBJECTS)\n");
+ fprintf(out, "\t$(DSOCOMMAND) libfltk_gl_s.o $(FLTK3GL_OBJECTS)\n");
fprintf(out, "\techo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o\n");
fprintf(out, "\t$(RM) $@\n");
fprintf(out, "\t$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o\n");
fprintf(out, "\t$(CHMOD) +x libfltk_gl_s.a\n");
fprintf(out, "\n");
- fprintf(out, "$(FLTK_IMAGES_LIBNAME): $(FLTK_IMAGES_OBJECTS)\n");
+ /*
+ fprintf(out, "$(FLTK3IMAGES_LIBNAME): $(FLTK3IMAGES_OBJECTS)\n");
fprintf(out, "\techo $(LIBCOMMAND) $@ ...\n");
fprintf(out, "\t$(RM) $@\n");
- fprintf(out, "\t$(LIBCOMMAND) $@ $(FLTK_IMAGES_OBJECTS)\n");
+ fprintf(out, "\t$(LIBCOMMAND) $@ $(FLTK3IMAGES_OBJECTS)\n");
fprintf(out, "\t$(RANLIB) $@\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_images.so.1.3: $(FLTK_IMAGES_OBJECTS) libfltk.so.1.3\n");
+ */
+ fprintf(out, "libfltk_images.so.1.3: $(FLTK3IMAGES_OBJECTS) libfltk.so.1.3\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk\n");
fprintf(out, "\t$(RM) libfltk_images.so\n");
fprintf(out, "\t$(LN) libfltk_images.so.1.3 libfltk_images.so\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_images.sl.1.3: $(FLTK_IMAGES_OBJECTS) libfltk.sl.1.3\n");
+ fprintf(out, "libfltk_images.sl.1.3: $(FLTK3IMAGES_OBJECTS) libfltk.sl.1.3\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK_IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk\n");
+ fprintf(out, "\t$(DSOCOMMAND) $@ $(FLTK3IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk\n");
fprintf(out, "\t$(RM) libfltk_images.sl\n");
fprintf(out, "\t$(LN) libfltk_images.sl.1.3 libfltk_images.sl\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_images.1.3.dylib: $(FLTK_IMAGES_OBJECTS) libfltk.1.3.dylib\n");
+ fprintf(out, "libfltk_images.1.3.dylib: $(FLTK3IMAGES_OBJECTS) libfltk.1.3.dylib\n");
fprintf(out, "\techo $(DSOCOMMAND) $@ ...\n");
fprintf(out, "\t$(DSOCOMMAND) $@ \\\n");
fprintf(out, "\t\t-install_name $(libdir)/$@ \\\n");
fprintf(out, "\t\t-current_version 1.3.0 \\\n");
fprintf(out, "\t\t-compatibility_version 1.3.0 \\\n");
- fprintf(out, "\t\t$(FLTK_IMAGES_OBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk\n");
+ fprintf(out, "\t\t$(FLTK3IMAGES_OBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk\n");
fprintf(out, "\t$(RM) libfltk_images.dylib\n");
fprintf(out, "\t$(LN) libfltk_images.1.3.dylib libfltk_images.dylib\n");
fprintf(out, "\n");
- fprintf(out, "libfltk_images_s.a: $(FLTK_IMAGES_OBJECTS)\n");
+ fprintf(out, "libfltk_images_s.a: $(FLTK3IMAGES_OBJECTS)\n");
fprintf(out, "\techo $(DSOCOMMAND) libfltk_images_s.o ...\n");
- fprintf(out, "\t$(DSOCOMMAND) libfltk_images_s.o $(FLTK_IMAGES_OBJECTS)\n");
+ fprintf(out, "\t$(DSOCOMMAND) libfltk_images_s.o $(FLTK3IMAGES_OBJECTS)\n");
fprintf(out, "\techo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o\n");
fprintf(out, "\t$(RM) $@\n");
fprintf(out, "\t$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o\n");
@@ -1939,20 +1948,20 @@
fprintf(out, "# cygwin GDI shared libraries\n");
fprintf(out, "#-----------------------------------------------------------------\n");
fprintf(out, "\n");
- fprintf(out, "cygfltknox-1.3.dll: $(FLTK_LIBNAME)\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltknox-1.3.dll: $(FLTK3_LIBNAME)\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk.dll.a $(LDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "cygfltknox_gl-1.3.dll: $(FLTK_GL_LIBNAME) cygfltknox-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltknox_gl-1.3.dll: $(FLTK3GL_LIBNAME) cygfltknox-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_gl.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk $(GLDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "cygfltknox_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) cygfltknox-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltknox_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) cygfltknox-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_images.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \\\n");
fprintf(out, "\t\t\t$(IMAGELIBS) $(LDLIBS)\n");
@@ -1961,32 +1970,32 @@
fprintf(out, "# cygwin X11 shared libraries\n");
fprintf(out, "#-----------------------------------------------------------------\n");
fprintf(out, "\n");
- fprintf(out, "cygfltk-1.3.dll: $(FLTK_LIBNAME)\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltk-1.3.dll: $(FLTK3_LIBNAME)\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk.dll.a $(LDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "cygfltk_gl-1.3.dll: $(FLTK_GL_LIBNAME) cygfltk-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltk_gl-1.3.dll: $(FLTK3GL_LIBNAME) cygfltk-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_gl.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk $(GLDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "cygfltk_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) cygfltk-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "cygfltk_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) cygfltk-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_images.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \\\n");
fprintf(out, "\t\t\t$(IMAGELIBS) $(LDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "mgwfltknox-1.3.dll: $(FLTK_LIBNAME)\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "mgwfltknox-1.3.dll: $(FLTK3_LIBNAME)\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk.dll.a $(LDLIBS)\n");
fprintf(out, "\n");
- fprintf(out, "mgwfltknox_gl-1.3.dll: $(FLTK_GL_LIBNAME) mgwfltknox-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "mgwfltknox_gl-1.3.dll: $(FLTK3GL_LIBNAME) mgwfltknox-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_gl.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk $(GLDLIBS)\n");
fprintf(out, "\n");
@@ -1994,27 +2003,27 @@
fprintf(out, "# See STR #1585 for --exclude-libs\n");
fprintf(out, "#-----------------------------------------------------\n");
fprintf(out, "\n");
- fprintf(out, "mgwfltknox_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) mgwfltknox-1.3.dll\n");
- fprintf(out, "\techo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...\n");
- fprintf(out, "\t$(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
+ fprintf(out, "mgwfltknox_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) mgwfltknox-1.3.dll\n");
+ fprintf(out, "\techo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...\n");
+ fprintf(out, "\t$(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \\\n");
fprintf(out, "\t\t-Wl,--out-implib=libfltk_images.dll.a \\\n");
fprintf(out, "\t\t-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \\\n");
fprintf(out, "\t\t\t$(IMAGELIBS) $(LDLIBS)\n");
fprintf(out, "\n");
fprintf(out, "clean:\n");
fprintf(out, "\t-$(RM) *.o xutf8/*.o *.dll.a core.* *~ *.bak *.bck\n");
- fprintf(out, "\t-$(RM) $(FLTK_DSONAME) $(FLTK_GL_DSONAME) $(FLTK_IMAGES_DSONAME) \\\n");
- fprintf(out, "\t\t$(FLTK_LIBNAME) $(FLTK_GL_LIBNAME) \\\n");
- fprintf(out, "\t\t$(FLTK_IMAGES_LIBNAME) \\\n");
+ fprintf(out, "\t-$(RM) $(FLTK3_DSONAME) $(FLTK3GL_DSONAME) $(FLTK3IMAGES_DSONAME) \\\n");
+ fprintf(out, "\t\t$(FLTK3_LIBNAME) $(FLTK3GL_LIBNAME) \\\n");
+ fprintf(out, "\t\t$(FLTK3IMAGES_LIBNAME) \\\n");
fprintf(out, "\t\tlibfltk.so libfltk_gl.so libfltk_images.so \\\n");
fprintf(out, "\t\tlibfltk.sl libfltk_gl.sl libfltk_images.sl \\\n");
fprintf(out, "\t\tlibfltk.dylib \\\n");
fprintf(out, "\t\tlibfltk_gl.dylib libfltk_images.dylib \\\n");
- fprintf(out, "\t\tcmap core\n");
+ fprintf(out, "\t\tcmap\n");
fprintf(out, "\n");
- fprintf(out, "depend:\t$(FLTK_CPPFILES) $(FLTK_MMFILES) $(FLTK_GL_CPPFILES) $(FLTK_IMAGES_CPPFILES) $(FLTK_CFILES)\n");
- fprintf(out, "\tmakedepend -Y -I.. -f makedepend $(FLTK_CPPFILES) $(FLTK_MMFILES) \\\n");
- fprintf(out, "\t\t$(FLTK_GL_CPPFILES) $(FLTK_IMAGES_CPPFILES) $(FLTK_CFILES)\n");
+ fprintf(out, "depend:\t$(FLTK3_CPPFILES) $(FLTK3_MMFILES) $(FLTK3GL_CPPFILES) $(FLTK3IMAGES_CPPFILES) $(FLTK3_CFILES)\n");
+ fprintf(out, "\tmakedepend -Y -I../include -f makedepend $(FLTK3_CPPFILES) $(FLTK3_MMFILES) \\\n");
+ fprintf(out, "\t\t$(FLTK3GL_CPPFILES) $(FLTK3IMAGES_CPPFILES) $(FLTK3_CFILES)\n");
fprintf(out, "\n");
fprintf(out, "# Automatically generated dependencies... generated on a Linux/Unix host !\n");
fprintf(out, "include makedepend\n");
@@ -2087,111 +2096,111 @@
fprintf(out, "\n");
fprintf(out, "################################################################\n");
fprintf(out, "\n");
- fprintf(out, "install: $(FLTK_LIBNAME) $(FLTK_DSONAME) \\\n");
- fprintf(out, "\t$(FLTK_GL_LIBNAME) $(FLTK_GL_DSONAME) \\\n");
- fprintf(out, "\t$(FLTK_IMAGES_LIBNAME) $(FLTK_IMAGES_DSONAME) \n");
+ fprintf(out, "install: $(FLTK3_LIBNAME) $(FLTK3_DSONAME) \\\n");
+ fprintf(out, "\t$(FLTK3GL_LIBNAME) $(FLTK3GL_DSONAME) \\\n");
+ fprintf(out, "\t$(FLTK3IMAGES_LIBNAME) $(FLTK3IMAGES_DSONAME) \n");
fprintf(out, "\techo \"Installing libraries in $(DESTDIR)$(libdir)...\"\n");
fprintf(out, "\t-$(INSTALL_DIR) $(DESTDIR)$(libdir)\n");
fprintf(out, "\t-$(INSTALL_DIR) $(DESTDIR)$(bindir)\n");
- fprintf(out, "\t$(RM) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)\n");
- fprintf(out, "\t$(INSTALL_LIB) $(FLTK_LIBNAME) $(DESTDIR)$(libdir)\n");
- fprintf(out, "\t$(INSTALL_LIB) $(FLTK_IMAGES_LIBNAME) $(DESTDIR)$(libdir)\n");
- fprintf(out, "\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)\n");
- fprintf(out, "\tif test x$(FLTK_GL_LIBNAME) != x; then \\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_GL_LIBNAME) $(DESTDIR)$(libdir); \\\n");
- fprintf(out, "\t\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_GL_LIBBASENAME); \\\n");
+ fprintf(out, "\t$(RM) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)\n");
+ fprintf(out, "\t$(INSTALL_LIB) $(FLTK3_LIBNAME) $(DESTDIR)$(libdir)\n");
+ fprintf(out, "\t$(INSTALL_LIB) $(FLTK3IMAGES_LIBNAME) $(DESTDIR)$(libdir)\n");
+ fprintf(out, "\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)\n");
+ fprintf(out, "\tif test x$(FLTK3GL_LIBNAME) != x; then \\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3GL_LIBNAME) $(DESTDIR)$(libdir); \\\n");
+ fprintf(out, "\t\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3GL_LIBBASENAME); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_IMAGES_LIBBASENAME)\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.so.1.3; then\\\n");
+ fprintf(out, "\t$(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3IMAGES_LIBBASENAME)\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk.so.1.3 $(DESTDIR)$(libdir)/libfltk.so;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk.sl.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk.sl.1.3 $(DESTDIR)$(libdir)/libfltk.sl;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk.1.3.dylib $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk.1.3.dylib $(DESTDIR)$(libdir)/libfltk.dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xcygfltknox-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME);\\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xcygfltknox-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME);\\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xmgwfltknox-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME);\\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xmgwfltknox-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME);\\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.so.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl.so.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_gl.so.1.3 $(DESTDIR)$(libdir)/libfltk_gl.so;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl.sl.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_gl.sl.1.3 $(DESTDIR)$(libdir)/libfltk_gl.sl;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl.1.3.dylib $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_gl.1.3.dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME);\\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_GL_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME);\\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3GL_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME);\\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_GL_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME);\\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3GL_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_images.so.1.3 $(DESTDIR)$(libdir)/libfltk_images.so;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images.sl.1.3 $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_images.sl.1.3 $(DESTDIR)$(libdir)/libfltk_images.sl;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images.1.3.dylib $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\t\t$(LN) libfltk_images.1.3.dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_IMAGES_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3IMAGES_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \\\n");
- fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK_IMAGES_DSONAME) $(DESTDIR)$(bindir); \\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \\\n");
+ fprintf(out, "\t\t$(INSTALL_LIB) $(FLTK3IMAGES_DSONAME) $(DESTDIR)$(bindir); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\\\n");
fprintf(out, "\t\t$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \\\n");
fprintf(out, "\tfi\n");
@@ -2199,83 +2208,83 @@
fprintf(out, "\n");
fprintf(out, "uninstall:\n");
fprintf(out, "\techo \"Uninstalling libraries...\"\n");
- fprintf(out, "\t$(RM) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.so.1.3; then\\\n");
+ fprintf(out, "\t$(RM) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xlibfltk_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xlibfltk_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xcygfltknox-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xcygfltknox-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xcygfltk-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xcygfltk-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_DSONAME) = xmgwfltknox-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3_DSONAME) = xmgwfltknox-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_LIBNAME) != x; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/$(FLTK_GL_LIBBASENAME);\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_LIBNAME) != x; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/$(FLTK3GL_LIBBASENAME);\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.so.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xlibfltk_gl_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xlibfltk_gl_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xcygfltk_gl-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xcygfltk_gl-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_LIBNAME) != x; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/$(FLTK_IMAGES_LIBBASENAME);\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_LIBNAME) != x; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/$(FLTK3IMAGES_LIBBASENAME);\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images_s.a; then\\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images_s.a; then\\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xcygfltk_images-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xcygfltk_images-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\\\n");
fprintf(out, "\tfi\n");
- fprintf(out, "\tif test x$(FLTK_IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\\\n");
- fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \\\n");
+ fprintf(out, "\tif test x$(FLTK3IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\\\n");
+ fprintf(out, "\t\t$(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \\\n");
fprintf(out, "\t\t$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\\\n");
fprintf(out, "\tfi\n");
write_footer(out);
@@ -2327,7 +2336,7 @@
fprintf(out, "gldemos:\t$(GLALL)\n");
fprintf(out, "\n");
fprintf(out, "depend:\t$(CPPFILES)\n");
- fprintf(out, "\tmakedepend -Y -I.. -f makedepend $(CPPFILES)\n");
+ fprintf(out, "\tmakedepend -Y -I../include -f makedepend $(CPPFILES)\n");
fprintf(out, "\n");
fprintf(out, "# Automatically generated dependencies...\n");
fprintf(out, "include makedepend\n");
@@ -2417,7 +2426,7 @@
fprintf(out, "\t../fluid/fluid$(EXEEXT) -c $<\n");
fprintf(out, "\n");
fprintf(out, "# All demos depend on the FLTK library...\n");
- fprintf(out, "$(ALL): $(FLTK_LIBNAME)\n");
+ fprintf(out, "$(ALL): $(FLTK3_LIBNAME)\n");
fprintf(out, "\n");
// write all targets
Modified: branches/branch-3.0/makeinclude.in
===================================================================
--- branches/branch-3.0/makeinclude.in 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/makeinclude.in 2011-08-22 17:27:33 UTC (rev 8993)
@@ -147,7 +147,7 @@
.o$(EXEEXT):
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINK_FLTK) $(LDLIBS) -o $@
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINK_FLTK3) $(LDLIBS) -o $@
.c.o:
echo Compiling $<...
Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/src/Makefile 2011-08-22 17:27:33 UTC (rev 8993)
@@ -320,121 +320,121 @@
$(LIBCOMMAND) $@ $(FLTK3_OBJECTS)
$(RANLIB) $@
-$(FLTK3JPEG_LIBNAME): $(FLTK3JPEG_OBJECTS)
+$(FLTK3GL_LIBNAME): $(FLTK3GL_OBJECTS)
echo $(LIBCOMMAND) $@ ...
$(RM) $@
- $(LIBCOMMAND) $@ $(FLTK3JPEG_OBJECTS)
+ $(LIBCOMMAND) $@ $(FLTK3GL_OBJECTS)
$(RANLIB) $@
+$(FLTK3IMAGES_LIBNAME): $(FLTK3IMAGES_OBJECTS)
+ echo $(LIBCOMMAND) $@ ...
+ $(RM) $@
+ $(LIBCOMMAND) $@ $(FLTK3IMAGES_OBJECTS)
+ $(RANLIB) $@
+
$(FLTK3PNG_LIBNAME): $(FLTK3PNG_OBJECTS)
echo $(LIBCOMMAND) $@ ...
$(RM) $@
$(LIBCOMMAND) $@ $(FLTK3PNG_OBJECTS)
$(RANLIB) $@
+$(FLTK3JPEG_LIBNAME): $(FLTK3JPEG_OBJECTS)
+ echo $(LIBCOMMAND) $@ ...
+ $(RM) $@
+ $(LIBCOMMAND) $@ $(FLTK3JPEG_OBJECTS)
+ $(RANLIB) $@
+
$(FLTK3ZLIB_LIBNAME): $(FLTK3ZLIB_OBJECTS)
echo $(LIBCOMMAND) $@ ...
$(RM) $@
$(LIBCOMMAND) $@ $(FLTK3ZLIB_OBJECTS)
$(RANLIB) $@
-libfltk.so.1.3: $(FLTK_OBJECTS)
+libfltk.so.1.3: $(FLTK3_OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_OBJECTS)
+ $(DSOCOMMAND) $@ $(FLTK3_OBJECTS)
$(RM) libfltk.so
$(LN) libfltk.so.1.3 libfltk.so
-libfltk.sl.1.3: $(FLTK_OBJECTS)
+libfltk.sl.1.3: $(FLTK3_OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_OBJECTS)
+ $(DSOCOMMAND) $@ $(FLTK3_OBJECTS)
$(RM) libfltk.sl
$(LN) libfltk.sl.1.3 libfltk.sl
-libfltk.1.3.dylib: $(FLTK_OBJECTS)
+libfltk.1.3.dylib: $(FLTK3_OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(FLTK_OBJECTS) $(LDLIBS)
+ $(FLTK3_OBJECTS) $(LDLIBS)
$(RM) libfltk.dylib
$(LN) libfltk.1.3.dylib libfltk.dylib
-libfltk_s.a: $(FLTK_OBJECTS)
+libfltk_s.a: $(FLTK3_OBJECTS)
echo $(DSOCOMMAND) libfltk_s.o ...
- $(DSOCOMMAND) libfltk_s.o $(FLTK_OBJECTS) $(IMAGELIBS)
+ $(DSOCOMMAND) libfltk_s.o $(FLTK3_OBJECTS) $(IMAGELIBS)
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_s.a libfltk_s.o
$(CHMOD) +x libfltk_s.a
-$(FLTK3GL_LIBNAME): $(FLTK3GL_OBJECTS)
- echo $(LIBCOMMAND) $@ ...
- $(RM) $@
- $(LIBCOMMAND) $@ $(FLTK3GL_OBJECTS)
- $(RANLIB) $@
-
-libfltk_gl.so.1.3: $(FLTK_GL_OBJECTS) libfltk.so.1.3
+libfltk_gl.so.1.3: $(FLTK3GL_OBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_GL_OBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLTK3GL_OBJECTS) -L. -lfltk
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.3 libfltk_gl.so
-libfltk_gl.sl.1.3: $(FLTK_GL_OBJECTS) libfltk.sl.1.3
+libfltk_gl.sl.1.3: $(FLTK3GL_OBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_GL_OBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLTK3GL_OBJECTS) -L. -lfltk
$(RM) libfltk_gl.sl
$(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
-libfltk_gl.1.3.dylib: $(FLTK_GL_OBJECTS) libfltk.1.3.dylib
+libfltk_gl.1.3.dylib: $(FLTK3GL_OBJECTS) libfltk.1.3.dylib
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(FLTK_GL_OBJECTS) -L. $(GLDLIBS) -lfltk
+ $(FLTK3GL_OBJECTS) -L. $(GLDLIBS) -lfltk
$(RM) libfltk_gl.dylib
$(LN) libfltk_gl.1.3.dylib libfltk_gl.dylib
-libfltk_gl_s.a: $(FLTK_GL_OBJECTS)
+libfltk_gl_s.a: $(FLTK3GL_OBJECTS)
echo $(DSOCOMMAND) libfltk_gl_s.o ...
- $(DSOCOMMAND) libfltk_gl_s.o $(FLTK_GL_OBJECTS)
+ $(DSOCOMMAND) libfltk_gl_s.o $(FLTK3GL_OBJECTS)
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
-$(FLTK3IMAGES_LIBNAME): $(FLTK3IMAGES_OBJECTS)
- echo $(LIBCOMMAND) $@ ...
- $(RM) $@
- $(LIBCOMMAND) $@ $(FLTK3IMAGES_OBJECTS)
- $(RANLIB) $@
-
-libfltk_images.so.1.3: $(FLTK_IMAGES_OBJECTS) libfltk.so.1.3
+libfltk_images.so.1.3: $(FLTK3IMAGES_OBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(FLTK3IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk
$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.3 libfltk_images.so
-libfltk_images.sl.1.3: $(FLTK_IMAGES_OBJECTS) libfltk.sl.1.3
+libfltk_images.sl.1.3: $(FLTK3IMAGES_OBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLTK_IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(FLTK3IMAGES_OBJECTS) -L. $(IMAGELIBS) -lfltk
$(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.3 libfltk_images.sl
-libfltk_images.1.3.dylib: $(FLTK_IMAGES_OBJECTS) libfltk.1.3.dylib
+libfltk_images.1.3.dylib: $(FLTK3IMAGES_OBJECTS) libfltk.1.3.dylib
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(FLTK_IMAGES_OBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
+ $(FLTK3IMAGES_OBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.3.dylib libfltk_images.dylib
-libfltk_images_s.a: $(FLTK_IMAGES_OBJECTS)
+libfltk_images_s.a: $(FLTK3IMAGES_OBJECTS)
echo $(DSOCOMMAND) libfltk_images_s.o ...
- $(DSOCOMMAND) libfltk_images_s.o $(FLTK_IMAGES_OBJECTS)
+ $(DSOCOMMAND) libfltk_images_s.o $(FLTK3IMAGES_OBJECTS)
echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
$(RM) $@
$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
@@ -452,20 +452,20 @@
# cygwin GDI shared libraries
#-----------------------------------------------------------------
-cygfltknox-1.3.dll: $(FLTK_LIBNAME)
- echo $(DSOCOMMAND) $(FLTK_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \
+cygfltknox-1.3.dll: $(FLTK3_LIBNAME)
+ echo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS)
-cygfltknox_gl-1.3.dll: $(FLTK_GL_LIBNAME) cygfltknox-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \
+cygfltknox_gl-1.3.dll: $(FLTK3GL_LIBNAME) cygfltknox-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS)
-cygfltknox_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) cygfltknox-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \
+cygfltknox_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) cygfltknox-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS)
@@ -474,32 +474,32 @@
# cygwin X11 shared libraries
#-----------------------------------------------------------------
-cygfltk-1.3.dll: $(FLTK_LIBNAME)
- echo $(DSOCOMMAND) $(FLTK_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \
+cygfltk-1.3.dll: $(FLTK3_LIBNAME)
+ echo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS)
-cygfltk_gl-1.3.dll: $(FLTK_GL_LIBNAME) cygfltk-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \
+cygfltk_gl-1.3.dll: $(FLTK3GL_LIBNAME) cygfltk-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS)
-cygfltk_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) cygfltk-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \
+cygfltk_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) cygfltk-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS)
-mgwfltknox-1.3.dll: $(FLTK_LIBNAME)
- echo $(DSOCOMMAND) $(FLTK_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_LIBNAME) -Wl,--no-whole-archive \
+mgwfltknox-1.3.dll: $(FLTK3_LIBNAME)
+ echo $(DSOCOMMAND) $(FLTK3_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk.dll.a $(LDLIBS)
-mgwfltknox_gl-1.3.dll: $(FLTK_GL_LIBNAME) mgwfltknox-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_GL_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_GL_LIBNAME) -Wl,--no-whole-archive \
+mgwfltknox_gl-1.3.dll: $(FLTK3GL_LIBNAME) mgwfltknox-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3GL_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3GL_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS)
@@ -507,27 +507,27 @@
# See STR #1585 for --exclude-libs
#-----------------------------------------------------
-mgwfltknox_images-1.3.dll: $(FLTK_IMAGES_LIBNAME) mgwfltknox-1.3.dll
- echo $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) ...
- $(DSOCOMMAND) $(FLTK_IMAGES_LIBNAME) -Wl,--no-whole-archive \
+mgwfltknox_images-1.3.dll: $(FLTK3IMAGES_LIBNAME) mgwfltknox-1.3.dll
+ echo $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) ...
+ $(DSOCOMMAND) $(FLTK3IMAGES_LIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS)
clean:
-$(RM) *.o xutf8/*.o *.dll.a core.* *~ *.bak *.bck
- -$(RM) $(FLTK_DSONAME) $(FLTK_GL_DSONAME) $(FLTK_IMAGES_DSONAME) \
- $(FLTK_LIBNAME) $(FLTK_GL_LIBNAME) \
- $(FLTK_IMAGES_LIBNAME) \
+ -$(RM) $(FLTK3_DSONAME) $(FLTK3GL_DSONAME) $(FLTK3IMAGES_DSONAME) \
+ $(FLTK3_LIBNAME) $(FLTK3GL_LIBNAME) \
+ $(FLTK3IMAGES_LIBNAME) \
libfltk.so libfltk_gl.so libfltk_images.so \
libfltk.sl libfltk_gl.sl libfltk_images.sl \
libfltk.dylib \
libfltk_gl.dylib libfltk_images.dylib \
cmap
-depend: $(FLTK_CPPFILES) $(FLTK_MMFILES) $(FLTK_GL_CPPFILES) $(FLTK_IMAGES_CPPFILES) $(FLTK_CFILES)
- makedepend -Y -I.. -f makedepend $(FLTK_CPPFILES) $(FLTK_MMFILES) \
- $(FLTK_GL_CPPFILES) $(FLTK_IMAGES_CPPFILES) $(FLTK_CFILES)
+depend: $(FLTK3_CPPFILES) $(FLTK3_MMFILES) $(FLTK3GL_CPPFILES) $(FLTK3IMAGES_CPPFILES) $(FLTK3_CFILES)
+ makedepend -Y -I../include -f makedepend $(FLTK3_CPPFILES) $(FLTK3_MMFILES) \
+ $(FLTK3GL_CPPFILES) $(FLTK3IMAGES_CPPFILES) $(FLTK3_CFILES)
# Automatically generated dependencies... generated on a Linux/Unix host !
include makedepend
@@ -600,111 +600,111 @@
################################################################
-install: $(FLTK_LIBNAME) $(FLTK_DSONAME) \
- $(FLTK_GL_LIBNAME) $(FLTK_GL_DSONAME) \
- $(FLTK_IMAGES_LIBNAME) $(FLTK_IMAGES_DSONAME)
+install: $(FLTK3_LIBNAME) $(FLTK3_DSONAME) \
+ $(FLTK3GL_LIBNAME) $(FLTK3GL_DSONAME) \
+ $(FLTK3IMAGES_LIBNAME) $(FLTK3IMAGES_DSONAME)
echo "Installing libraries in $(DESTDIR)$(libdir)..."
-$(INSTALL_DIR) $(DESTDIR)$(libdir)
-$(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)
- $(INSTALL_LIB) $(FLTK_LIBNAME) $(DESTDIR)$(libdir)
- $(INSTALL_LIB) $(FLTK_IMAGES_LIBNAME) $(DESTDIR)$(libdir)
- $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)
- if test x$(FLTK_GL_LIBNAME) != x; then \
- $(INSTALL_LIB) $(FLTK_GL_LIBNAME) $(DESTDIR)$(libdir); \
- $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_GL_LIBBASENAME); \
+ $(RM) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)
+ $(INSTALL_LIB) $(FLTK3_LIBNAME) $(DESTDIR)$(libdir)
+ $(INSTALL_LIB) $(FLTK3IMAGES_LIBNAME) $(DESTDIR)$(libdir)
+ $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)
+ if test x$(FLTK3GL_LIBNAME) != x; then \
+ $(INSTALL_LIB) $(FLTK3GL_LIBNAME) $(DESTDIR)$(libdir); \
+ $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3GL_LIBBASENAME); \
fi
- $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK_IMAGES_LIBBASENAME)
- if test x$(FLTK_DSONAME) = xlibfltk.so.1.3; then\
+ $(RANLIB) $(DESTDIR)$(libdir)/$(FLTK3IMAGES_LIBBASENAME)
+ if test x$(FLTK3_DSONAME) = xlibfltk.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
$(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk.so.1.3 $(DESTDIR)$(libdir)/libfltk.so;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk.sl.1.3; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
$(INSTALL_LIB) libfltk.sl.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk.sl.1.3 $(DESTDIR)$(libdir)/libfltk.sl;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk.1.3.dylib; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
$(INSTALL_LIB) libfltk.1.3.dylib $(DESTDIR)$(libdir); \
$(LN) libfltk.1.3.dylib $(DESTDIR)$(libdir)/libfltk.dylib;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk_s.a; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_DSONAME) = xcygfltknox-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME);\
- $(INSTALL_LIB) $(FLTK_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3_DSONAME) = xcygfltknox-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME);\
+ $(INSTALL_LIB) $(FLTK3_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_DSONAME) = xmgwfltknox-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME);\
- $(INSTALL_LIB) $(FLTK_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3_DSONAME) = xmgwfltknox-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME);\
+ $(INSTALL_LIB) $(FLTK3_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.so.1.3; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
$(INSTALL_LIB) libfltk_gl.so.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.so.1.3 $(DESTDIR)$(libdir)/libfltk_gl.so;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.sl.1.3; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
$(INSTALL_LIB) libfltk_gl.sl.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.sl.1.3 $(DESTDIR)$(libdir)/libfltk_gl.sl;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
$(INSTALL_LIB) libfltk_gl.1.3.dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_gl.1.3.dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl_s.a; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
$(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME);\
- $(INSTALL_LIB) $(FLTK_GL_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME);\
+ $(INSTALL_LIB) $(FLTK3GL_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME);\
- $(INSTALL_LIB) $(FLTK_GL_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME);\
+ $(INSTALL_LIB) $(FLTK3GL_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
$(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk_images.so.1.3 $(DESTDIR)$(libdir)/libfltk_images.so;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
$(INSTALL_LIB) libfltk_images.sl.1.3 $(DESTDIR)$(libdir); \
$(LN) libfltk_images.sl.1.3 $(DESTDIR)$(libdir)/libfltk_images.sl;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
$(INSTALL_LIB) libfltk_images.1.3.dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_images.1.3.dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images_s.a; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
$(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \
- $(INSTALL_LIB) $(FLTK_IMAGES_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \
+ $(INSTALL_LIB) $(FLTK3IMAGES_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
fi
- if test x$(FLTK_IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \
- $(INSTALL_LIB) $(FLTK_IMAGES_DSONAME) $(DESTDIR)$(bindir); \
+ if test x$(FLTK3IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \
+ $(INSTALL_LIB) $(FLTK3IMAGES_DSONAME) $(DESTDIR)$(bindir); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
fi
@@ -712,83 +712,83 @@
uninstall:
echo "Uninstalling libraries..."
- $(RM) $(DESTDIR)$(libdir)/$(FLTK_LIBBASENAME)
- if test x$(FLTK_DSONAME) = xlibfltk.so.1.3; then\
+ $(RM) $(DESTDIR)$(libdir)/$(FLTK3_LIBBASENAME)
+ if test x$(FLTK3_DSONAME) = xlibfltk.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk.sl.1.3; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk.1.3.dylib; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
fi
- if test x$(FLTK_DSONAME) = xlibfltk_s.a; then\
+ if test x$(FLTK3_DSONAME) = xlibfltk_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
fi
- if test x$(FLTK_DSONAME) = xcygfltknox-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \
+ if test x$(FLTK3_DSONAME) = xcygfltknox-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi
- if test x$(FLTK_DSONAME) = xcygfltk-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \
+ if test x$(FLTK3_DSONAME) = xcygfltk-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi
- if test x$(FLTK_DSONAME) = xmgwfltknox-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_DSONAME); \
+ if test x$(FLTK3_DSONAME) = xmgwfltknox-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
fi
- if test x$(FLTK_GL_LIBNAME) != x; then\
- $(RM) $(DESTDIR)$(libdir)/$(FLTK_GL_LIBBASENAME);\
+ if test x$(FLTK3GL_LIBNAME) != x; then\
+ $(RM) $(DESTDIR)$(libdir)/$(FLTK3GL_LIBBASENAME);\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.so.1.3; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.sl.1.3; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
fi
- if test x$(FLTK_GL_DSONAME) = xlibfltk_gl_s.a; then\
+ if test x$(FLTK3GL_DSONAME) = xlibfltk_gl_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
fi
- if test x$(FLTK_GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \
+ if test x$(FLTK3GL_DSONAME) = xcygfltknox_gl-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi
- if test x$(FLTK_GL_DSONAME) = xcygfltk_gl-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \
+ if test x$(FLTK3GL_DSONAME) = xcygfltk_gl-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi
- if test x$(FLTK_GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_GL_DSONAME); \
+ if test x$(FLTK3GL_DSONAME) = xmgwfltknox_gl-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3GL_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
fi
- if test x$(FLTK_IMAGES_LIBNAME) != x; then\
- $(RM) $(DESTDIR)$(libdir)/$(FLTK_IMAGES_LIBBASENAME);\
+ if test x$(FLTK3IMAGES_LIBNAME) != x; then\
+ $(RM) $(DESTDIR)$(libdir)/$(FLTK3IMAGES_LIBBASENAME);\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.so.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images.1.3.dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xlibfltk_images_s.a; then\
+ if test x$(FLTK3IMAGES_DSONAME) = xlibfltk_images_s.a; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \
+ if test x$(FLTK3IMAGES_DSONAME) = xcygfltknox_images-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xcygfltk_images-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \
+ if test x$(FLTK3IMAGES_DSONAME) = xcygfltk_images-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi
- if test x$(FLTK_IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\
- $(RM) $(DESTDIR)$(bindir)/$(FLTK_IMAGES_DSONAME); \
+ if test x$(FLTK3IMAGES_DSONAME) = xmgwfltknox_images-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(FLTK3IMAGES_DSONAME); \
$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
fi
Modified: branches/branch-3.0/test/Makefile
===================================================================
--- branches/branch-3.0/test/Makefile 2011-08-22 16:52:31 UTC (rev 8992)
+++ branches/branch-3.0/test/Makefile 2011-08-22 17:27:33 UTC (rev 8993)
@@ -179,7 +179,7 @@
gldemos: $(GLALL)
depend: $(CPPFILES)
- makedepend -Y -I.. -f makedepend $(CPPFILES)
+ makedepend -Y -I../include -f makedepend $(CPPFILES)
# Automatically generated dependencies...
include makedepend
@@ -266,7 +266,7 @@
../fluid/fluid$(EXEEXT) -c $<
# All demos depend on the FLTK library...
-$(ALL): $(FLTK_LIBNAME)
+$(ALL): $(FLTK3_LIBNAME)
Demo$(EXEEXT): demo.o $(FLTK3_LIB_NAME)
echo Linking $@...
[ Direct Link to Message ] | |
