Aquila-Consortium/libsharp2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more cleanups

Browse source
This commit is contained in:
Martin Reinecke 2019-03-01 10:17:16 +01:00
parent e4b490b34f
commit 0944aadfde
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -16,6 +16,8 @@ libsharp_la_SOURCES = \
libsharp/sharp_vecsupport.h \ libsharp/sharp_vecsupport.h \
libsharp/sharp_ylmgen_c.h libsharp/sharp_ylmgen_c.h
AM_CFLAGS = @AM_CFLAGS@
if HAVE_MULTIARCH if HAVE_MULTIARCH
libavx_la_SOURCES = libsharp/sharp_core_inc.c libavx_la_SOURCES = libsharp/sharp_core_inc.c
@ -51,8 +53,6 @@ sharp_testsuite_LDADD = libsharp.la @POCKETFFT_LIBS@
TESTS = runtest.sh TESTS = runtest.sh
AM_CFLAGS = @AM_CFLAGS@ @POCKETFFT_CFLAGS@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
nodist_pkgconfig_DATA = @PACKAGE_NAME@.pc nodist_pkgconfig_DATA = @PACKAGE_NAME@.pc

9
configure.ac
View file

@ -21,7 +21,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_OPENMP
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
PKG_CHECK_MODULES([POCKETFFT], [pocketfft], , [POCKETFFT_LIBS="-lpocketfft -lm"]) 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'` tmpval=`echo $CFLAGS | grep -c '\-DMULTIARCH'`
AM_CONDITIONAL([HAVE_MULTIARCH], [test $tmpval -gt 0]) AM_CONDITIONAL([HAVE_MULTIARCH], [test $tmpval -gt 0])
AM_CFLAGS="$AM_CFLAGS $OPENMP_CFLAGS $POCKETFFT_CFLAGS"
LIBS=$POCKETFFT_LIBS LIBS=$POCKETFFT_LIBS
PACKAGE_LIBS="-lsharp" PACKAGE_LIBS="-lsharp"
PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OPENMP_CFLAGS"
PACKAGE_LDFLAGS="$PACKAGE_LDFLAGS $OPENMP_CFLAGS"
dnl dnl
dnl Create pkgconfig .pc file. dnl Create pkgconfig .pc file.
dnl dnl
AX_CREATE_PKGCONFIG_INFO(,,,,[]) AX_CREATE_PKGCONFIG_INFO(,,,,[])
AC_SUBST([LIBS])
AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_LDFLAGS])
AC_SUBST([POCKETFFT_CFLAGS])
AC_SUBST([POCKETFFT_LIBS])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT