From d137ad5d36991982a690ced43cbc67cb1ee09a80 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Sun, 13 Sep 2015 23:49:09 +0200 Subject: [PATCH] Changing directory conventions --- Makefile.am | 2 +- configure.ac | 5 +++++ src/Makefile.am | 2 +- vtk/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27aec946..87061f4c 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = src vtk +SUBDIRS = src vtk openfpm_data bin_PROGRAMS = diff --git a/configure.ac b/configure.ac index efccd84a..05265295 100755 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AC_PREREQ(2.59) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/main.cpp]) +AC_CONFIG_SUBDIRS([openfpm_data]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([src/config/config.h]) m4_ifdef([ACX_PTHREAD],,[m4_include([m4/acx_pthread.m4])]) @@ -20,6 +21,10 @@ CXXFLAGS+=" --std=c++11 " NVCCFLAGS=" " INCLUDES_PATH=" " +# Add openfpm_pdata to prefix forlder +prefix="$prefix//openfpm_pdata" +echo "Installation dir is: $prefix" + # Checks for programs. AC_PROG_CXX diff --git a/src/Makefile.am b/src/Makefile.am index bb08ecdc..0eb9f473 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) -bin_PROGRAMS = pdata +noinst_PROGRAMS = pdata pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -Wno-unused-function pdata_CFLAGS = $(CUDA_CFLAGS) diff --git a/vtk/Makefile.am b/vtk/Makefile.am index 9d975d96..cc819623 100644 --- a/vtk/Makefile.am +++ b/vtk/Makefile.am @@ -1,7 +1,7 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) -bin_PROGRAMS = cart_dec metis_dec dom_box +noinst_PROGRAMS = cart_dec metis_dec dom_box cart_dec_SOURCES = CartDecomposition_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp cart_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function cart_dec_CFLAGS = $(CUDA_CFLAGS) -- GitLab