Commit 1811dab6 authored by Lorenz Huedepohl's avatar Lorenz Huedepohl
Browse files

Forgot @API_VERSION@ in Makefile.am library names

parent d4fa9422
......@@ -5,10 +5,10 @@ AM_LDFLAGS = -L$(libdir) -Wl,-rpath -Wl,$(libdir) @AM_LDFLAGS@ $(OPENMP_CFLAGS)
AM_FCFLAGS = @AM_FCFLAGS@ $(OPENMP_FCFLAGS)
# libraries
lib_LTLIBRARIES = libftimings-@FCNAME@.la libftimings_perflib-@FCNAME@.la
lib_LTLIBRARIES = libftimings-@API_VERSION@-@FCNAME@.la libftimings_perflib-@API_VERSION@-@FCNAME@.la
# libftimings
libftimings_@FCNAME@_la_SOURCES = \
libftimings_@API_VERSION@_@FCNAME@_la_SOURCES = \
ftimings/time.c \
ftimings/resident_set_size.c \
ftimings/virtual_memory.c \
......@@ -19,21 +19,21 @@ libftimings_@FCNAME@_la_SOURCES = \
ftimings/ftimings_c_support.c
if HAVE_LIBPAPI
libftimings_@FCNAME@_la_SOURCES += \
libftimings_@API_VERSION@_@FCNAME@_la_SOURCES += \
ftimings/papi.c
endif
if HAVE_PERF
libftimings_@FCNAME@_la_SOURCES += \
libftimings_@API_VERSION@_@FCNAME@_la_SOURCES += \
ftimings/perf_memory_counter.c
endif
libftimings_@FCNAME@_la_LDFLAGS = -version-info @FTIMINGS_SO_VERSION@
libftimings_@API_VERSION@_@FCNAME@_la_LDFLAGS = -version-info @FTIMINGS_SO_VERSION@
# perflib wrapper library
libftimings_perflib_@FCNAME@_la_SOURCES = \
libftimings_perflib_@API_VERSION@_@FCNAME@_la_SOURCES = \
perf_wrapper/perf_wrapper.F90
libftimings_perflib_@FCNAME@_la_LDFLAGS = -version-info @FTIMINGS_SO_VERSION@
libftimings_perflib_@API_VERSION@_@FCNAME@_la_LDFLAGS = -version-info @FTIMINGS_SO_VERSION@
ftimings_includedir = $(includedir)/ftimings-@API_VERSION@-@FCNAME@
nobase_ftimings_include_HEADERS = ftimings.mod
......@@ -60,13 +60,13 @@ ftimings_@FCNAME@_example_SOURCES = \
examples/example.F90 \
examples/do_flops.c \
examples/do_memory_transfer.c
ftimings_@FCNAME@_example_LDADD = libftimings-@FCNAME@.la
ftimings_@FCNAME@_example_LDADD = libftimings-@API_VERSION@-@FCNAME@.la
ftimings_@FCNAME@_example_LDFLAGS = -static
# C example
ftimings_c_example_SOURCES = \
examples/c_example.c
ftimings_c_example_LDADD = libftimings-@FCNAME@.la
ftimings_c_example_LDADD = libftimings-@API_VERSION@-@FCNAME@.la
ftimings_c_example_LDFLAGS = $(FCLIBS)
......@@ -94,7 +94,7 @@ endif
test_perflib_SOURCES = \
examples/perflib.F90
test_perflib_LDADD = libftimings-@FCNAME@.la libftimings_perflib-@FCNAME@.la
test_perflib_LDADD = libftimings-@API_VERSION@-@FCNAME@.la libftimings_perflib-@API_VERSION@-@FCNAME@.la
# other files to distribute
filesdir = $(datadir)/@PACKAGE@-@FCNAME@/examples
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment