changed too many VERSION to PACKAGE_VERSION, partially undo; refs #12
This commit is contained in:
@@ -55,8 +55,8 @@ AC_CONFIG_FILES([makefile ${PACKAGE_NAME}.spec src/version.cxx
|
|||||||
LIB_MAJOR=m4_eval(x_major+x_minor)
|
LIB_MAJOR=m4_eval(x_major+x_minor)
|
||||||
LIB_MINOR=x_least
|
LIB_MINOR=x_least
|
||||||
LIB_LEAST=x_minor
|
LIB_LEAST=x_minor
|
||||||
LIB_PACKAGE_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
|
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
|
||||||
AC_SUBST(LIB_PACKAGE_VERSION)
|
AC_SUBST(LIB_VERSION)
|
||||||
|
|
||||||
# home
|
# home
|
||||||
AC_SUBST(HOME)
|
AC_SUBST(HOME)
|
||||||
@@ -300,6 +300,7 @@ AC_SUBST(LIBS)
|
|||||||
|
|
||||||
# create output
|
# create output
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
# infos and warnings
|
# infos and warnings
|
||||||
if test "$have_doxygen" = "no"; then
|
if test "$have_doxygen" = "no"; then
|
||||||
AC_MSG_WARN([Missing program doxygen!
|
AC_MSG_WARN([Missing program doxygen!
|
||||||
|
@@ -571,15 +571,15 @@ SHOW_FILES = YES
|
|||||||
|
|
||||||
SHOW_NAMESPACES = 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
|
# 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
|
# the version control system). Doxygen will invoke the program by executing (via
|
||||||
# popen()) the command <command> <input-file>, where <command> is the value of
|
# 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
|
# provided by doxygen. Whatever the program writes to standard output
|
||||||
# is used as the file version. See the manual for examples.
|
# 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
|
# 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
|
# 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
|
# 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
|
# 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
|
# $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"
|
WARN_FORMAT = "$file:$line: $text"
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@ pkgconfig2_DATA = $(pkgconfig_DATA)
|
|||||||
|
|
||||||
EXTRA_DIST = $(pkgconfig_DATA).in
|
EXTRA_DIST = $(pkgconfig_DATA).in
|
||||||
|
|
||||||
AM_LDFLAGS = -version-info ${LIB_PACKAGE_VERSION}
|
AM_LDFLAGS = -version-info ${LIB_VERSION}
|
||||||
|
|
||||||
lib_LTLIBRARIES = libmrw.la
|
lib_LTLIBRARIES = libmrw.la
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
@@ -97,7 +97,7 @@ if HAVE_STACKTRACE
|
|||||||
libmrw_la_SOURCES += \
|
libmrw_la_SOURCES += \
|
||||||
mrw/stacktrace.hxx stacktrace.cxx
|
mrw/stacktrace.hxx stacktrace.cxx
|
||||||
endif
|
endif
|
||||||
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
|
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||||
libmrw_la_LIBADD =
|
libmrw_la_LIBADD =
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
libmrw_la_LIBADD += -lltdl
|
libmrw_la_LIBADD += -lltdl
|
||||||
@@ -107,7 +107,7 @@ if HAVE_THREADS
|
|||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
|
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
|
||||||
libmrw_mt_la_CXXFLAGS = @THREADS@
|
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@
|
@THREADS@
|
||||||
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
|
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
|
||||||
endif
|
endif
|
||||||
@@ -115,13 +115,13 @@ endif
|
|||||||
|
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
|
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
|
libmrwexcstderr_la_LIBADD = libmrw.la
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
|
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
|
||||||
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
|
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
|
libmrwexcstderr_mt_la_LIBADD = libmrw-mt.la
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -129,7 +129,7 @@ if AUTOFNTRACE
|
|||||||
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
|
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
|
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
|
||||||
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
|
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||||
libmrwautofunctiontracestdlog_la_LIBADD = libmrw.la
|
libmrwautofunctiontracestdlog_la_LIBADD = libmrw.la
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
@@ -137,7 +137,7 @@ if HAVE_BOOST_THREAD
|
|||||||
autofunctiontracestdlog.cxx version.cxx
|
autofunctiontracestdlog.cxx version.cxx
|
||||||
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
|
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
|
||||||
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
|
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
|
||||||
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
|
-version-info @LIB_VERSION@ @THREADS@
|
||||||
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
|
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
|
||||||
libmrw-mt.la
|
libmrw-mt.la
|
||||||
endif
|
endif
|
||||||
@@ -145,13 +145,13 @@ endif
|
|||||||
endif
|
endif
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
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
|
libmrwexclog4cxx_la_LIBADD = libmrw.la -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
||||||
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
|
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
|
libmrwexclog4cxx_mt_la_LIBADD = libmrw-mt.la -llog4cxx
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -159,7 +159,7 @@ if AUTOFNTRACE
|
|||||||
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
|
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
|
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
|
libmrwautofunctiontracelog4cxx_la_LIBADD = libmrw.la -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
@@ -167,7 +167,7 @@ if HAVE_BOOST_THREAD
|
|||||||
autofunctiontracelog4cxx.cxx version.cxx
|
autofunctiontracelog4cxx.cxx version.cxx
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
|
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
||||||
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
|
-version-info @LIB_VERSION@ @THREADS@
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
||||||
libmrw-mt.la -llog4cxx
|
libmrw-mt.la -llog4cxx
|
||||||
endif
|
endif
|
||||||
@@ -177,13 +177,13 @@ endif
|
|||||||
endif
|
endif
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
|
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
|
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
|
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
|
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
|
||||||
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
|
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
|
||||||
@THREADS@
|
@THREADS@
|
||||||
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
|
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
|
||||||
endif
|
endif
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
# if __cplusplus < 201103L
|
# if __cplusplus < 201103L
|
||||||
# if __cplusplus==1
|
# if __cplusplus==1
|
||||||
# if __APPLE__
|
# 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
|
/// Code is compiled with old non C++11 standard compliant compiler
|
||||||
/** There are workarounds for old non C++11 compatible
|
/** There are workarounds for old non C++11 compatible
|
||||||
compilers. These workarounds are deprecated, but will
|
compilers. These workarounds are deprecated, but will
|
||||||
@@ -73,7 +73,7 @@ namespace std {
|
|||||||
# warning trying standard C++11 support
|
# warning trying standard C++11 support
|
||||||
# include <memory>
|
# include <memory>
|
||||||
# endif
|
# 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
|
/// Code is compiled with an old non C++11 standard compliant compiler
|
||||||
/** There are workarounds for old non C++11 compatible
|
/** There are workarounds for old non C++11 compatible
|
||||||
compilers. These workarounds are deprecated, but will remain
|
compilers. These workarounds are deprecated, but will remain
|
||||||
|
@@ -101,7 +101,7 @@ if HAVE_STACKTRACE
|
|||||||
libmrw_la_SOURCES += \
|
libmrw_la_SOURCES += \
|
||||||
stacktrace.hxx stacktrace.cxx
|
stacktrace.hxx stacktrace.cxx
|
||||||
endif
|
endif
|
||||||
libmrw_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@
|
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||||
libmrw_la_LIBADD =
|
libmrw_la_LIBADD =
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
libmrw_la_LIBADD += -lltdl
|
libmrw_la_LIBADD += -lltdl
|
||||||
@@ -111,7 +111,7 @@ if HAVE_THREADS
|
|||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
|
libmrw_mt_la_SOURCES = $(libmrw_la_SOURCES)
|
||||||
libmrw_mt_la_CXXFLAGS = @THREADS@
|
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@
|
@THREADS@
|
||||||
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
|
libmrw_mt_la_LIBADD = $(libmrw_la_LIBADD) @BOOST_THREAD_LIB@
|
||||||
endif
|
endif
|
||||||
@@ -119,13 +119,13 @@ endif
|
|||||||
|
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx
|
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
|
libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
|
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx
|
||||||
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
|
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
|
libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -133,7 +133,7 @@ if AUTOFNTRACE
|
|||||||
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
|
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
|
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
|
libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
@@ -141,7 +141,7 @@ if HAVE_BOOST_THREAD
|
|||||||
autofunctiontracelog4cxx.cxx version.cxx
|
autofunctiontracelog4cxx.cxx version.cxx
|
||||||
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
|
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
|
||||||
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
|
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
|
||||||
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
|
-version-info @LIB_VERSION@ @THREADS@
|
||||||
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
|
libmrwautofunctiontracestdlog_mt_la_LIBADD = \
|
||||||
$(top_builddir)/mrw/libmrw-mt.la
|
$(top_builddir)/mrw/libmrw-mt.la
|
||||||
endif
|
endif
|
||||||
@@ -149,13 +149,13 @@ endif
|
|||||||
endif
|
endif
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
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
|
libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx
|
||||||
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
|
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
|
libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -163,7 +163,7 @@ if AUTOFNTRACE
|
|||||||
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
|
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
|
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
|
libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
if HAVE_BOOST_THREAD
|
if HAVE_BOOST_THREAD
|
||||||
@@ -171,7 +171,7 @@ if HAVE_BOOST_THREAD
|
|||||||
autofunctiontracelog4cxx.cxx version.cxx
|
autofunctiontracelog4cxx.cxx version.cxx
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
|
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
||||||
-version-info @LIB_PACKAGE_VERSION@ @THREADS@
|
-version-info @LIB_VERSION@ @THREADS@
|
||||||
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
||||||
$(top_builddir)/mrw/libmrw-mt.la -llog4cxx
|
$(top_builddir)/mrw/libmrw-mt.la -llog4cxx
|
||||||
endif
|
endif
|
||||||
@@ -181,13 +181,13 @@ endif
|
|||||||
endif
|
endif
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx
|
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
|
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
|
||||||
if HAVE_THREADS
|
if HAVE_THREADS
|
||||||
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
|
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
|
||||||
version.cxx
|
version.cxx
|
||||||
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
|
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
|
||||||
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_PACKAGE_VERSION@ \
|
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
|
||||||
@THREADS@
|
@THREADS@
|
||||||
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
|
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user