diff --git a/dimension_t/Makefile b/dimension_t/Makefile index ab59118..5863173 100644 --- a/dimension_t/Makefile +++ b/dimension_t/Makefile @@ -13,7 +13,7 @@ CFLAGS=-I$(INCLUDE_TOOLDIR) -I$(INCLUDE_PERMDIR) -I./src -DIMSRC=src/dimension_t.c +DIMSRC=src/dimension_t/dimension_t.c DIMSRC_O=$(DIMSRC:.c=.o) PERMSRC_O=$(PERMDIR)/src/permutation_t/permutation_t.o diff --git a/dimension_t/src/dimension_t.c b/dimension_t/src/dimension_t/dimension_t.c similarity index 69% rename from dimension_t/src/dimension_t.c rename to dimension_t/src/dimension_t/dimension_t.c index fba273d..950829d 100644 --- a/dimension_t/src/dimension_t.c +++ b/dimension_t/src/dimension_t/dimension_t.c @@ -1,4 +1,4 @@ -#include "dimension_t.h" +#include "dimension_t/dimension_t.h" dimension * create_dim(size_t sz){ diff --git a/dimension_t/src/dimension_t.h b/dimension_t/src/dimension_t/dimension_t.h similarity index 100% rename from dimension_t/src/dimension_t.h rename to dimension_t/src/dimension_t/dimension_t.h diff --git a/dimension_t/test/Makefile b/dimension_t/test/Makefile index 04d7e22..769b519 100644 --- a/dimension_t/test/Makefile +++ b/dimension_t/test/Makefile @@ -24,7 +24,7 @@ DIMDIR=$(PWD)/.. PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o -DIMSRC_O=$(INCLUDE_DIR)/dimension_t.o +DIMSRC_O=$(INCLUDE_DIR)/dimension_t/dimension_t.o TOPTARGETS := all clean diff --git a/dimension_t/test/compile.sh b/dimension_t/test/compile.sh index be0f2e9..56bb1dd 100644 --- a/dimension_t/test/compile.sh +++ b/dimension_t/test/compile.sh @@ -15,7 +15,7 @@ DIR_YTEST=$PWD/../../ytest_t SRC=../src PERMSRC=$PWD/../../ypermutation_t/src -gcc -o launch_is_good_c $1 -L$DIR_YTEST $2 -lytest -I$DIR_YTEST/include_ytest/include $PERMSRC/permutation_t/permutation_t.o $PERMSRC/set_theoric_t/set_theoric_t.o $SRC/dimension_t.c -I$SRC -I$PERMSRC +gcc -o launch_is_good_c $1 -L$DIR_YTEST $2 -lytest -I$DIR_YTEST/include_ytest/include $PERMSRC/permutation_t/permutation_t.o $PERMSRC/set_theoric_t/set_theoric_t.o $SRC/dimension_t/dimension_t.c -I$SRC -I$PERMSRC #gcc -o launch_is_good_c $1 $2 -lytest -I../include_ytest src/permutation_t/permutation_t.o src/set_theoric_t/set_theoric_t.o -I./src export LD_LIBRARY_PATH=$DIR_YTEST/:LD_LIBRARY_PATH diff --git a/dimension_t/test/is_good.c b/dimension_t/test/is_good.c index 29acb59..7b4a79b 100644 --- a/dimension_t/test/is_good.c +++ b/dimension_t/test/is_good.c @@ -14,7 +14,7 @@ //#include "permutation_t/permutation_t.h" -#include "dimension_t.h" +#include "dimension_t/dimension_t.h" TEST(dimension0){