From 272807f3a58effe4feb1fc57421a2cd5b65560d9 Mon Sep 17 00:00:00 2001 From: Pietro Incardona Date: Mon, 14 Sep 2015 10:35:46 +0200 Subject: [PATCH] supporting make install --- configure.ac | 4 ++++ src/Makefile.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index db4784d..fff4b7d 100755 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,10 @@ CXXFLAGS+=" --std=c++11 -march=native -mtune=native -Wno-unused-local-typedefs - NVCCFLAGS=" " INCLUDES_PATH=" " +# Add openfpm_pdata to prefix forlder +prefix="$prefix/openfpm_io" +echo "Installation dir is: $prefix" + # Checks for programs. AC_PROG_CXX diff --git a/src/Makefile.am b/src/Makefile.am index 4fe9649..32a7596 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,14 @@ LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_IOSTREAMS_LIB) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB) -bin_PROGRAMS = io +noinst_PROGRAMS = io io_SOURCES = main.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_data/src/Memleak_check.cpp io_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) -I/usr/local/include io_CFLAGS = $(CUDA_CFLAGS) io_LDADD = $(LINKLIBS) +nobase_include_HEADERS = csv_multiarray.hpp CSVWriter.hpp GraphMLWriter.hpp util.hpp VTKWriter.hpp VTKWriter_graph.hpp VTKWriter_grids.hpp VTKWriter_grids_st.hpp VTKWriter_grids_util.hpp VTKWriter_vector_box.hpp + + .cu.o : $(NVCC) $(NVCCFLAGS) -o $@ -c $< -- GitLab