Wrong library name for OpenMP

ELPA_2014.06/Makefile.am

@@ -6,71 +6,71 @@ AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
 AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
 
 # libelpa
-lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@@SUFFIX@.la
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LINK = $(FCLINK)
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
+lib_LTLIBRARIES = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 
 
 ##rule to produce fortran config file:
 #config_f90.h: ./config.h
 #	grep "^#define" ./config.h > $@
 
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES = src/elpa1.F90 src/elpa2.F90
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES = src/elpa1.F90 src/elpa2.F90
 
 if WITH_REAL_GENERIC_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES +=  src/elpa2_kernels/elpa2_kernels_real.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES +=  src/elpa2_kernels/elpa2_kernels_real.f90
 endif
 
 if WITH_COMPLEX_GENERIC_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES +=  src/elpa2_kernels/elpa2_kernels_complex.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES +=  src/elpa2_kernels/elpa2_kernels_complex.f90
 endif
 
 if WITH_REAL_GENERIC_SIMPLE_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_simple.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_simple.f90
 endif
 
 if WITH_COMPLEX_GENERIC_SIMPLE_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90
 endif
 
 if WITH_REAL_BGP_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90
 endif
 
 if WITH_REAL_BGQ_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90
 endif
 
 if WITH_REAL_SSE_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
 else
 if WITH_COMPLEX_SSE_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
 endif
 endif
 
 if WITH_REAL_AVX_BLOCK2_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
 endif
 
 if WITH_REAL_AVX_BLOCK4_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
 endif
 
 if WITH_REAL_AVX_BLOCK6_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
 endif
 
 if WITH_COMPLEX_AVX_BLOCK1_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
 endif
 
 if WITH_COMPLEX_AVX_BLOCK2_KERNEL
-  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
+  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
 endif
 
 #if WITH_AVX_SANDYBRIDGE
-#  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
+#  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
 #                                           src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
 #endif
 
@@ -115,7 +115,7 @@ noinst_PROGRAMS = \
 	elpa2_test_real_choose_kernel_with_api@SUFFIX@ \
 	elpa2_test_complex_choose_kernel_with_api@SUFFIX@
 
-build_lib = libelpa-@PACKAGE_VERSION@@SUFFIX@.la
+build_lib = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
 
 elpa1_test_real@SUFFIX@_SOURCES = test/test_real.F90 test/util.F90
 elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
@@ -236,7 +236,7 @@ libtool: $(LIBTOOL_DEPS)
 
 # $1	Object name
 define require_elpa_lib
-$1: libelpa-@PACKAGE_VERSION@@SUFFIX@.la
+$1: libelpa@SUFFIX@-@PACKAGE_VERSION@.la
 
 endef
 $(foreach p,$(bin_PROGRAMS) $(noinst_PROGRAMS),$(foreach o,$($p_OBJECTS),$(eval $(call require_elpa_lib,$o))))

ELPA_2014.06/Makefile.in

@@ -158,8 +158,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(filesdir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LIBADD =
-am__libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES_DIST = src/elpa1.F90 \
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LIBADD =
+am__libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES_DIST = src/elpa1.F90 \
 	src/elpa2.F90 src/elpa2_kernels/elpa2_kernels_real.f90 \
 	src/elpa2_kernels/elpa2_kernels_complex.f90 \
 	src/elpa2_kernels/elpa2_kernels_real_simple.f90 \
@@ -186,14 +186,14 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__objects_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo
 @WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__objects_12 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.lo
 @WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__objects_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo
-am_libelpa_@PACKAGE_VERSION@@SUFFIX@_la_OBJECTS = src/elpa1.lo \
+am_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS = src/elpa1.lo \
 	src/elpa2.lo $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
 	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
 	$(am__objects_12) $(am__objects_13)
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_OBJECTS =  \
-	$(am_libelpa_@PACKAGE_VERSION@@SUFFIX@_la_OBJECTS)
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS =  \
+	$(am_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_elpa1_test_complex@SUFFIX@_OBJECTS = test/test_complex.$(OBJEXT) \
 	test/util.$(OBJEXT)
@@ -334,7 +334,7 @@ AM_V_CCAS = $(am__v_CCAS_@AM_V@)
 am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
 am__v_CCAS_0 = @echo "  CCAS    " $@;
 am__v_CCAS_1 = 
-SOURCES = $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES) \
+SOURCES = $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES) \
 	$(elpa1_test_complex@SUFFIX@_SOURCES) \
 	$(elpa1_test_real@SUFFIX@_SOURCES) \
 	$(elpa2_print_kernels@SUFFIX@_SOURCES) \
@@ -345,7 +345,7 @@ SOURCES = $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES) \
 	$(elpa2_test_real_choose_kernel_with_api@SUFFIX@_SOURCES) \
 	$(elpa2_test_real_default_kernel@SUFFIX@_SOURCES)
 DIST_SOURCES =  \
-	$(am__libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES_DIST) \
+	$(am__libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES_DIST) \
 	$(elpa1_test_complex@SUFFIX@_SOURCES) \
 	$(elpa1_test_real@SUFFIX@_SOURCES) \
 	$(elpa2_print_kernels@SUFFIX@_SOURCES) \
@@ -644,7 +644,9 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_FCFLAGS = @OPENMP_FCFLAGS@
+OPENMP_LDFLAGS = @OPENMP_LDFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -730,13 +732,13 @@ AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
 AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
 
 # libelpa
-lib_LTLIBRARIES = libelpa-@PACKAGE_VERSION@@SUFFIX@.la
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LINK = $(FCLINK)
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
+lib_LTLIBRARIES = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
 
 #config_f90.h: ./config.h
 #	grep "^#define" ./config.h > $@
-libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES = src/elpa1.F90 \
+libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES = src/elpa1.F90 \
 	src/elpa2.F90 $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8) $(am__append_9) \
@@ -744,7 +746,7 @@ libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES = src/elpa1.F90 \
 	$(am__append_13)
 
 #if WITH_AVX_SANDYBRIDGE
-#  libelpa_@PACKAGE_VERSION@@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
+#  libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
 #                                           src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
 #endif
 
@@ -774,7 +776,7 @@ dist_doc_DATA = README COPYING/COPYING COPYING/gpl.txt COPYING/lgpl.txt
 # pkg-config stuff
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PKG_CONFIG_FILE@
-build_lib = libelpa-@PACKAGE_VERSION@@SUFFIX@.la
+build_lib = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
 elpa1_test_real@SUFFIX@_SOURCES = test/test_real.F90 test/util.F90
 elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
 elpa2_test_real@SUFFIX@_SOURCES = test/test_real2.F90 test/util.F90
@@ -959,8 +961,8 @@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo:  \
 	src/elpa2_kernels/$(am__dirstamp) \
 	src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
 
-libelpa-@PACKAGE_VERSION@@SUFFIX@.la: $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_DEPENDENCIES) $(EXTRA_libelpa_@PACKAGE_VERSION@@SUFFIX@_la_DEPENDENCIES) 
-	$(AM_V_GEN)$(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LINK) -rpath $(libdir) $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_OBJECTS) $(libelpa_@PACKAGE_VERSION@@SUFFIX@_la_LIBADD) $(LIBS)
+libelpa@SUFFIX@-@PACKAGE_VERSION@.la: $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_DEPENDENCIES) $(EXTRA_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_DEPENDENCIES) 
+	$(AM_V_GEN)$(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK) -rpath $(libdir) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1932,7 +1934,7 @@ libtool: $(LIBTOOL_DEPS)
 
 # $1	Object name
 define require_elpa_lib
-$1: libelpa-@PACKAGE_VERSION@@SUFFIX@.la
+$1: libelpa@SUFFIX@-@PACKAGE_VERSION@.la
 
 endef
 $(foreach p,$(bin_PROGRAMS) $(noinst_PROGRAMS),$(foreach o,$($p_OBJECTS),$(eval $(call require_elpa_lib,$o))))

ELPA_2014.06/configure

@@ -638,6 +638,8 @@ LTLIBOBJS
 LIBOBJS
 PKG_CONFIG_FILE
 SUFFIX
+OPENMP_LDFLAGS
+OPENMP_CFLAGS
 with_amd_bulldozer_kernel
 WITH_BLACS
 WITH_MKL
@@ -5900,7 +5902,7 @@ $as_echo "$ac_cv_prog_fc_openmp" >&6; }
         # Append to flags as this influences which
         # kind of MPI library has to be used (thread-safe or not)
         FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
-	LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
+	LDFLAGS="$OPENMP_FCFLAGS $LDFLAGS"
   fi
 save_FCFLAGS=$FCFLAGS
@@ -5909,8 +5911,8 @@ save_LDFLAGS=$LDFLAGS
-FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS $OPENMP_FCFLAGS"
-LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS $OPENMP_FCFLAGS"
+FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS"
+LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Fortran module iso_fortran_env is available" >&5
 $as_echo_n "checking whether Fortran module iso_fortran_env is available... " >&6; }
@@ -21100,6 +21102,9 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+
+
 #AC_SUBST(OPT_FCFLAGS)
 rm -rf modules/ .fortran_dependencies/

ELPA_2014.06/configure.ac

@@ -194,7 +194,7 @@ AC_ARG_WITH([openmp],
         # Append to flags as this influences which
         # kind of MPI library has to be used (thread-safe or not)
         FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
-	LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
+	LDFLAGS="$OPENMP_FCFLAGS $LDFLAGS"
   fi
 
 save_FCFLAGS=$FCFLAGS
@@ -203,8 +203,8 @@ save_LDFLAGS=$LDFLAGS
 AC_ARG_VAR([SCALAPACK_LDFLAGS],[Extra LDFLAGS necessary to link a program with Scalapack])
 AC_ARG_VAR([SCALAPACK_FCFLAGS],[Extra FCFLAGS necessary to compile a Fortran program with Scalapack])
 
-FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS $OPENMP_FCFLAGS"
-LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS $OPENMP_FCFLAGS"
+FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS"
+LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS"
 
 dnl check whether fortran error_unit is defined
 AC_MSG_CHECKING([whether Fortran module iso_fortran_env is available])
@@ -661,6 +661,9 @@ AC_SUBST([WITH_BLACS])
 AC_SUBST([with_amd_bulldozer_kernel])
 AC_SUBST([FC_MODINC])
 AC_SUBST([FC_MODOUT])
+AC_SUBST([OPENMP_CFLAGS])
+AC_SUBST([OPENMP_FCFLAGS])
+AC_SUBST([OPENMP_LDFLAGS])
 #AC_SUBST(OPT_FCFLAGS)
 
 rm -rf modules/ .fortran_dependencies/

ELPA_2014.06/elpa.pc.in

@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@-@PACKAGE_VERSION@
+Name: @PACKAGE_NAME@@SUFFIX@-@PACKAGE_VERSION@
 Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
 Version: @PACKAGE_VERSION@.@PACKAGE_MINOR_VERSION@
 URL: @PACKAGE_URL@
-Libs: -L${libdir} -lelpa-@PACKAGE_VERSION@ @LIBS@
-Cflags: -I${includedir}/elpa-@PACKAGE_VERSION@
-fcflags= -I${includedir}/elpa-@PACKAGE_VERSION@/modules
+Libs: -L${libdir} -lelpa@SUFFIX@-@PACKAGE_VERSION@ @LIBS@ @OPENMP_FCFLAGS@
+Cflags: -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@ @OPENMP_CFLAGS@
+fcflags= -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@/modules @OPENMP_FCFLAGS@