Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 06:24:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update configure and makeinclude.in to get rid of version numbers in Makefiles.

Browse Source 
configure is used to set all needed version numbers in makeinclude.
makeinclude is included in Makefile's and the version numbers are used
to build the correct shared libs.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10609 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser
2015-03-07 18:37:56 +00:00
parent 78783e1fd8
commit 1a69ba5ae9
4 changed files with 159 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cairo/Makefile
+28 -25
View File
@@ -16,6 +16,9 @@
# http://www.fltk.org/str.php # http://www.fltk.org/str.php
# #
# 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)
FLTKFLAGS = -DFL_LIBRARY FLTKFLAGS = -DFL_LIBRARY
include ../makeinclude include ../makeinclude
@@ -37,27 +40,27 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
$(LIBCOMMAND) $@ $(CAIROOBJECTS) $(LIBCOMMAND) $@ $(CAIROOBJECTS)
$(RANLIB) $@ $(RANLIB) $@
libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 libfltk_cairo.so.$(FL_API_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_API_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.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3 libfltk_cairo.sl.$(FL_API_VERSION): $(CAIROOBJECTS) ../src/libfltk.sl.$(FL_API_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.1.3 libfltk_cairo.sl $(LN) libfltk_cairo.sl.$(FL_API_VERSION) libfltk_cairo.sl
libfltk_cairo.1.3.dylib: $(CAIROOBJECTS) ../src/libfltk.1.3.dylib libfltk_cairo.$(FL_API_VERSION).dylib: $(CAIROOBJECTS) ../src/libfltk.$(FL_API_VERSION).dylib
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ \ $(DSOCOMMAND) $@ \
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
-current_version 1.3.3 \ -current_version $(FL_VERSION) \
-compatibility_version 1.3.0 \ -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.1.3.dylib libfltk_cairo.dylib $(LN) libfltk_cairo.$(FL_API_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 ...
@@ -68,13 +71,13 @@ libfltk_cairo_s.a: $(CAIROOBJECTS)
$(CHMOD) +x src/libfltk_cairo_s.a $(CHMOD) +x src/libfltk_cairo_s.a
cygfltknox_cairo-1.3.dll: $(CAIROLIBNAME) ../src/cygfltknox-1.3.dll cygfltknox_cairo-$(FL_API_VERSION).dll: $(CAIROLIBNAME) ../src/cygfltknox-$(FL_API_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-1.3.dll: $(CAIROLIBNAME) ../src/mgwfltknox-1.3.dll mgwfltknox_cairo-$(FL_API_VERSION).dll: $(CAIROLIBNAME) ../src/mgwfltknox-$(FL_API_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 \
@@ -98,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.1.3; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_API_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
$(INSTALL_LIB) libfltk_cairo.so.1.3 $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.so.$(FL_API_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.so.1.3 $(DESTDIR)$(libdir)/libfltk_cairo.so;\ $(LN) libfltk_cairo.so.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.so;\
fi fi
if test x$(CAIRODSONAME) = xsrc/libfltk_cairo.sl.1.3; then\ if test x$(CAIRODSONAME) = xsrc/libfltk_cairo.sl.$(FL_API_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\
$(INSTALL_LIB) libfltk_cairo.sl.1.3 $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.sl.1.3 $(DESTDIR)$(libdir)/libfltk_cairo.sl;\ $(LN) libfltk_cairo.sl.$(FL_API_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.sl;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.1.3.dylib; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_API_VERSION).dylib; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.*dylib;\
$(INSTALL_LIB) libfltk_cairo.1.3.dylib $(DESTDIR)$(libdir); \ $(INSTALL_LIB) libfltk_cairo.$(FL_API_VERSION).dylib $(DESTDIR)$(libdir); \
$(LN) libfltk_cairo.1.3.dylib $(DESTDIR)$(libdir)/libfltk_cairo.dylib;\ $(LN) libfltk_cairo.$(FL_API_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-1.3.dll; then\ if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_API_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-1.3.dll; then\ if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_API_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;\
@@ -138,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.1.3; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_API_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.sl.1.3; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.sl.$(FL_API_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\
fi fi
if test x$(CAIRODSONAME) = xlibfltk_cairo.1.3.dylib; then\ if test x$(CAIRODSONAME) = xlibfltk_cairo.$(FL_API_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-1.3.dll; then\ if test x$(CAIRODSONAME) = xcygfltknox_cairo-$(FL_API_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-1.3.dll; then\ if test x$(CAIRODSONAME) = xmgwfltknox_cairo-$(FL_API_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
configure.in
+4
View File
@@ -59,11 +59,15 @@ FL_MAJOR_VERSION=1
FL_MINOR_VERSION=3 FL_MINOR_VERSION=3
FL_PATCH_VERSION=3 FL_PATCH_VERSION=3
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
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_API_VERSION)
AC_SUBST(FL_ABI_VERSION)
AC_SUBST(FL_VERSION)
AC_SUBST(ARCHFLAGS) AC_SUBST(ARCHFLAGS)
AC_SUBST(OPTIM) AC_SUBST(OPTIM)
makeinclude.in
+12
View File
@@ -16,6 +16,18 @@
# http://www.fltk.org/str.php # http://www.fltk.org/str.php
# #
# FLTK version numbers
FL_MAJOR_VERSION = @FL_MAJOR_VERSION@
FL_MINOR_VERSION = @FL_MINOR_VERSION@
FL_PATCH_VERSION = @FL_PATCH_VERSION@
FL_API_VERSION = @FL_API_VERSION@
FL_ABI_VERSION = @FL_ABI_VERSION@
FL_VERSION = @FL_VERSION@
# Standard configure variables
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
src/Makefile
+115 -112
View File
File diff suppressed because it is too large Load Diff