From 0944aadfdec1dcbe1e69336ae579c06a0ea25242 Mon Sep 17 00:00:00 2001 From: Martin Reinecke <martin@mpa-garching.mpg.de> Date: Fri, 1 Mar 2019 10:17:16 +0100 Subject: [PATCH] more cleanups --- Makefile.am | 4 ++-- configure.ac | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44f5b35..94ded11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,8 @@ libsharp_la_SOURCES = \ libsharp/sharp_vecsupport.h \ libsharp/sharp_ylmgen_c.h +AM_CFLAGS = @AM_CFLAGS@ + if HAVE_MULTIARCH libavx_la_SOURCES = libsharp/sharp_core_inc.c @@ -51,8 +53,6 @@ sharp_testsuite_LDADD = libsharp.la @POCKETFFT_LIBS@ TESTS = runtest.sh -AM_CFLAGS = @AM_CFLAGS@ @POCKETFFT_CFLAGS@ - pkgconfigdir = $(libdir)/pkgconfig nodist_pkgconfig_DATA = @PACKAGE_NAME@.pc diff --git a/configure.ac b/configure.ac index 5763c4d..f636f83 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC_C99 - +AC_OPENMP AC_PROG_LIBTOOL PKG_CHECK_MODULES([POCKETFFT], [pocketfft], , [POCKETFFT_LIBS="-lpocketfft -lm"]) @@ -29,19 +29,18 @@ PKG_CHECK_MODULES([POCKETFFT], [pocketfft], , [POCKETFFT_LIBS="-lpocketfft -lm"] tmpval=`echo $CFLAGS | grep -c '\-DMULTIARCH'` AM_CONDITIONAL([HAVE_MULTIARCH], [test $tmpval -gt 0]) +AM_CFLAGS="$AM_CFLAGS $OPENMP_CFLAGS $POCKETFFT_CFLAGS" LIBS=$POCKETFFT_LIBS PACKAGE_LIBS="-lsharp" +PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OPENMP_CFLAGS" +PACKAGE_LDFLAGS="$PACKAGE_LDFLAGS $OPENMP_CFLAGS" dnl dnl Create pkgconfig .pc file. dnl AX_CREATE_PKGCONFIG_INFO(,,,,[]) -AC_SUBST([LIBS]) AC_SUBST([AM_CFLAGS]) -AC_SUBST([AM_LDFLAGS]) -AC_SUBST([POCKETFFT_CFLAGS]) -AC_SUBST([POCKETFFT_LIBS]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- GitLab