Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
4f43c44f
Commit
4f43c44f
authored
Nov 26, 2018
by
Loic Hausammann
Browse files
Logger: python library compiled only with autotools
parent
1176b1a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
4f43c44f
...
...
@@ -1040,7 +1040,7 @@ if test "x$with_python" != "xno"; then
fi
AC_SUBST([PYTHON_LIBS])
AC_SUBST([PYTHON_INCS])
AM_CONDITIONAL([HAVEPYTHON],[test -n "$PYTHON_
LIB
S"])
AM_CONDITIONAL([HAVEPYTHON],[test -n "$PYTHON_
INC
S"])
# Check for HDF5. This is required.
...
...
logger/Makefile.am
View file @
4f43c44f
...
...
@@ -16,16 +16,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Add the non-standard paths to the included library headers
AM_CFLAGS
=
$(PYTHON_INCS)
AM_CFLAGS
=
$(PYTHON_INCS)
-I
$(top_srcdir)
/src
$(HDF5_CPPFLAGS)
$(GSL_INCS)
$(FFTW_INCS)
$(GRACKLE_INCS)
AM_LDFLAGS
=
$(HDF5_LDFLAGS)
# Assign a "safe" version number
AM
_LDFLAGS
=
-version-info
0:0:0
BIN
_LDFLAGS
=
-version-info
0:0:0
# The git command, if available.
GIT_CMD
=
@GIT_CMD@
# Additional dependencies for shared libraries.
EXTRA_LIBS
=
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
$(TBBMALLOC_LIBS)
$(PYTHON_LIBS)
EXTRA_LIBS
=
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
$(TBBMALLOC_LIBS)
$(PYTHON_LIBS)
$(HDF5_LIBS)
$(FFTW_LIBS)
$(GRACKLE_LIBS)
$(VELOCIRAPTOR_LIBS)
$(GSL_LIBS)
# MPI libraries.
# MPI_LIBS = $(MPI_THREAD_LIBS)
...
...
@@ -42,19 +45,18 @@ lib_LTLIBRARIES = libswiftlogger.la
include_HEADERS
=
header.h io.h particle.h timeline.h logger_tools.h
# Common source files
AM_SOURCES
=
header.c io.c particle.c timeline.c
AM_SOURCES
=
header.c io.c particle.c timeline.c
logger_tools.c
if
HAVEPYTHON
AM_SOURCES
+=
logger_loader.c
endif
# Include files for distribution, not installation.
nobase_noinst_HEADERS
=
# Sources and flags for regular library
libswiftlogger_la_SOURCES
=
$(AM_SOURCES)
libswiftlogger_la_CFLAGS
=
$(AM_CFLAGS)
libswiftlogger_la_LDFLAGS
=
$(AM_LDFLAGS)
$(EXTRA_LIBS)
libswiftlogger_la_LDFLAGS
=
$(AM_LDFLAGS)
$(EXTRA_LIBS)
$(BIN_LDFLAGS)
# Sources and flags for MPI library
# libswiftlogger_mpi_la_SOURCES = $(AM_SOURCES)
...
...
@@ -63,7 +65,6 @@ libswiftlogger_la_LDFLAGS = $(AM_LDFLAGS) $(EXTRA_LIBS)
# libswiftlogger_mpi_la_SHORTNAME = mpi
# libswiftlogger_mpi_la_LIBADD =
# Versioning. If any sources change then update the version_string.h file with
# the current git revision and package version.
# May have a checkout without a version_string.h file and no git command (tar/zip
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment