From c84adc5d7f77fe58d4513efdd4963f943ce7e33e Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Sun, 13 Sep 2015 23:49:48 +0200 Subject: [PATCH] Changing directory conventions --- build_io.sh | 10 +++++----- src/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build_io.sh b/build_io.sh index 80266b5a..55968787 100755 --- a/build_io.sh +++ b/build_io.sh @@ -4,13 +4,13 @@ mkdir /tmp/openfpm_io mv * .[^.]* /tmp/openfpm_io -mv /tmp/openfpm_io OpenFPM_IO +mv /tmp/openfpm_io openfpm_io -mkdir OpenFPM_IO/src/config +mkdir openfpm_io/src/config -git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_devices.git OpenFPM_devices -git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_data.git OpenFPM_data -git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_pdata.git OpenFPM_pdata +git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_devices.git openfpm_devices +git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_data.git openfpm_data +git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_pdata.git openfpm_pdata cd "$1/OpenFPM_data" git checkout develop cd .. diff --git a/src/Makefile.am b/src/Makefile.am index 0ba63557..4fe9649f 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_IOSTREAMS_LIB) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB) bin_PROGRAMS = io -io_SOURCES = main.cpp ../../OpenFPM_devices/src/memory/HeapMemory.cpp ../../OpenFPM_data/src/Memleak_check.cpp +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) -- GitLab