libraries
/
mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

changed too many VERSION to PACKAGE_VERSION, partially undo; refs #12

Browse Source
master
Marc Wäckerlin 10 years ago
parent 1431eb73d5
commit 08aa68b422
5 changed files with 34 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      configure.ac
  2. 8
      doc/doxyfile.in
  3. 26
      src/makefile.am
  4. 4
      src/mrw/checkcxx11.hxx
  5. 24
      src/mrw/makefile.am

5
configure.ac
Unescape View File

@ -55,8 +55,8 @@ AC_CONFIG_FILES([makefile ${PACKAGE_NAME}.spec src/version.cxx
LIB_MAJOR=m4_eval(x_major+x_minor)
LIB_MINOR=x_least
LIB_LEAST=x_minor
LIB_PACKAGE_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
AC_SUBST(LIB_PACKAGE_VERSION)
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
AC_SUBST(LIB_VERSION)
# home
AC_SUBST(HOME)
@ -300,6 +300,7 @@ AC_SUBST(LIBS)
# create output
AC_OUTPUT
# infos and warnings
if test "$have_doxygen" = "no"; then
AC_MSG_WARN([Missing program doxygen!

8
doc/doxyfile.in
Unescape View File

@ -571,15 +571,15 @@ SHOW_FILES = YES
SHOW_NAMESPACES = YES
# The FILE_PACKAGE_VERSION_FILTER tag can be used to specify a program or script that
# The FILE_VERSION_FILTER tag can be used to specify a program or script that
# doxygen should invoke to get the current version for each file (typically from
# the version control system). Doxygen will invoke the program by executing (via
# popen()) the command <command> <input-file>, where <command> is the value of
# the FILE_PACKAGE_VERSION_FILTER tag, and <input-file> is the name of an input file
# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
FILE_PACKAGE_VERSION_FILTER =
FILE_VERSION_FILTER =
# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
# by doxygen. The layout file controls the global structure of the generated
@ -641,7 +641,7 @@ WARN_NO_PARAMDOC = NO
# tags, which will be replaced by the file and line number from which the
# warning originated and the warning text. Optionally the format may contain
# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_PACKAGE_VERSION_FILTER)
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text"

26
src/makefile.am
Unescape View File

@ -28,7 +28,7 @@ pkgconfig2_DATA = $(pkgconfig_DATA)
EXTRA_DIST = $(pkgconfig_DATA).in
AM_LDFLAGS = -version-info ${LIB_PACKAGE_VERSION}
AM_LDFLAGS = -version-info ${LIB_VERSION}
lib_LTLIBRARIES = libmrw.la
if HAVE_BOOST_THREAD
@ -97,7 +97,7 @@ if HAVE_STACKTRACE
libmrw_la_SOURCES += \
mrw/stacktrace.hxx stacktrace.cxx
endif
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
libmrw_la_LIBADD =
if HAVE_STACKTRACE
libmrw_la_LIBADD += -lltdl
@ -107,7 +107,7 @@ if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
libmrw_mt_la_CXXFLAGS = @THREADS@
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_PACKAGE_VERSION@ \
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_VERSION@ \
@THREADS@
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
endif
@ -115,13 +115,13 @@ endif
if HAVE_STACKTRACE
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexcstderr_la_LIBADD = libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LIBADD = libmrw-mt.la
endif
endif
@ -129,7 +129,7 @@ if AUTOFNTRACE
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
version.cxx
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracestdlog_la_LIBADD = libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
@ -137,7 +137,7 @@ if HAVE_BOOST_THREAD
autofunctiontracestdlog.cxx version.cxx
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
-version-info @LIB_VERSION@ @THREADS@
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
libmrw-mt.la
endif
@ -145,13 +145,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexclog4cxx_la_LIBADD = libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LIBADD = libmrw-mt.la -llog4cxx
endif
endif
@ -159,7 +159,7 @@ if AUTOFNTRACE
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
version.cxx
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracelog4cxx_la_LIBADD = libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
@ -167,7 +167,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
-version-info @LIB_VERSION@ @THREADS@
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
libmrw-mt.la -llog4cxx
endif
@ -177,13 +177,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
if HAVE_THREADS
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
version.cxx
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
@THREADS@
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
endif

4
src/mrw/checkcxx11.hxx
Unescape View File

@ -14,7 +14,7 @@
# if __cplusplus < 201103L
# if __cplusplus==1
# if __APPLE__
# if MAC_OS_X_PACKAGE_VERSION_MIN_REQUIRED < MAC_OS_X_PACKAGE_VERSION_10_9
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
/// Code is compiled with old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will
@ -73,7 +73,7 @@ namespace std {
# warning trying standard C++11 support
# include <memory>
# endif
# elif __APPLE__ && MAC_OS_X_PACKAGE_VERSION_MIN_REQUIRED < MAC_OS_X_PACKAGE_VERSION_10_9
# elif __APPLE__ && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
/// Code is compiled with an old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will remain

24
src/mrw/makefile.am
Unescape View File

@ -101,7 +101,7 @@ if HAVE_STACKTRACE
libmrw_la_SOURCES += \
stacktrace.hxx stacktrace.cxx
endif
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
libmrw_la_LIBADD =
if HAVE_STACKTRACE
libmrw_la_LIBADD += -lltdl
@ -111,7 +111,7 @@ if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
libmrw_mt_la_CXXFLAGS = @THREADS@
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_PACKAGE_VERSION@ \
libmrw_mt_la_LDFLAGS = $(libmrw_la_LDFLAGS) -version-info @LIB_VERSION@ \
@THREADS@
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
endif
@ -119,13 +119,13 @@ endif
if HAVE_STACKTRACE
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la
endif
endif
@ -133,7 +133,7 @@ if AUTOFNTRACE
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
version.cxx
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS
if HAVE_BOOST_THREAD
@ -141,7 +141,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
-version-info @LIB_VERSION@ @THREADS@
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
$(top_builddir)/mrw/libmrw-mt.la
endif
@ -149,13 +149,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx
endif
endif
@ -163,7 +163,7 @@ if AUTOFNTRACE
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
version.cxx
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS
if HAVE_BOOST_THREAD
@ -171,7 +171,7 @@ if HAVE_BOOST_THREAD
autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
-version-info @LIB_VERSION@ @THREADS@
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
$(top_builddir)/mrw/libmrw-mt.la -llog4cxx
endif
@ -181,13 +181,13 @@ endif
endif
if HAVE_LOG4CXX
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
if HAVE_THREADS
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
version.cxx
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
@THREADS@
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
endif

Write Preview
Loading…
Cancel
Save