kerep added as submodule

.gitignore

@@ -10,5 +10,4 @@ obj/
 .editorconfig
 *.user
 *.vcxproj.filters
-.config
+.config
-deps/kerep.a

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "kerep"]
+	path = kerep
+	url = https://github.com/Timerix22/kerep.git

build_scripts/build_configurations/build.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-source build_scripts/init.sh
+source build_scripts/pre_build.sh
 
 print "${CYAN}===============[build]================\n"
-clear_dir "$OUTDIR"
-clear_dir "$OBJDIR"
 compile_c "$BUILD_C_ARGS" "$SRC_C"
 compile_cpp "$BUILD_CPP_ARGS" "$SRC_CPP"
-ar x deps/* --output=obj
 link "$BUILD_CPP_ARGS $BUILD_LINKER_ARGS" "$BUILD_FILE"

build_scripts/build_configurations/build_dbg.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-source build_scripts/init.sh
+source build_scripts/pre_build.sh
 
 print "${CYAN}=============[build_dbg]==============\n"
-clear_dir "$OUTDIR"
-clear_dir "$OBJDIR"
 compile_c "$BUILD_DBG_C_ARGS" "$SRC_C"
 compile_cpp "$BUILD_DBG_CPP_ARGS" "$SRC_CPP"
 link "$BUILD_DBG_CPP_ARGS $BUILD_DBG_LINKER_ARGS" "$BUILD_FILE"

build_scripts/build_configurations/test_valgrind.sh

@@ -5,5 +5,5 @@ source build_scripts/init.sh
 print "${CYAN}===========[test_valgrind]============\n"
 cd $OUTDIR
 valgrind $VALGRIND_ARGS ./$BUILD_DBG_FILE
-cat "valgrind.log"
+cat valgrind.log
 cd ..

build_scripts/build_deps.sh

@@ -2,22 +2,12 @@
 source build_scripts/colors.sh
 
 printf "${CYAN}=============[build_deps]=============\n"
-mkdir -p deps
-cd ../kerep/
 
+cd kerep
 if [ ! -f "bin/kerep.a" ]; then
-    printf "${YELLOW}../kerep/bin/kerep.a doesn't exist\n"
+    printf "${YELLOW}kerep/bin/kerep.a doesn't exist\n"
-    while true; do
-        printf "${WHITE}build it from source? (y/n) "
-        read answ
-        case $answ in
-            [Yy] ) break;;
-            [Nn] ) exit;;
-            * ) printf "${RED}incorrect answer\n";;
-        esac
-    done
     make build_static_lib
 fi
-cp bin/kerep.a ../cobek/deps/
+cp bin/kerep.a ../obj/
-printf "${GREEN} copied ${CYAN}kerep.a\n"
+printf "${GREEN}copied ${CYAN}kerep.a\n"
-cd ../cobek
+cd ..

build_scripts/functions.sh

@@ -59,7 +59,8 @@ function link {
     print "${BLUE}args: ${GRAY}$args\n"
     local outfile=$OUTDIR/$2
     print "${BLUE}outfile: ${GRAY}$outfile\n"
-    local objects="$(find $OBJDIR -name *.o)"
+    local objects="$(find $OBJDIR -name *.o)
+$(find $OBJDIR -name *.a)"
     print "${BLUE}objects: ${GRAY}$objects\n"
     if $CMP_CPP $args -o $outfile $(echo $objects | tr '\n' ' ')
     then 

build_scripts/init.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-reset
 tabs 4
 
 source build_scripts/colors.sh
@@ -21,5 +20,3 @@ if [ ! -f ".config" ]; then
     done
 fi
 source .config
-
-bash build_scripts/build_deps.sh

build_scripts/pre_build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source build_scripts/init.sh
+
+clear_dir "$OUTDIR"
+clear_dir "$OBJDIR"
+bash build_scripts/build_deps.sh