fix build

Author: igagis

.github/workflows/ci.yml

@@ -73,7 +73,7 @@ jobs:
           - {os: ubuntu, codename: noble, image_owner: }
           # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
           # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
-          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
+          # - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}

src/makefile

@@ -5,11 +5,12 @@ include prorab-clang-format.mk
 
 $(eval $(call prorab-config, ../config))
 
-this_name := papki
+this_src_dir := papki
+this_name := $(this_src_dir)$(this_dbg)
 
 this_soname := $(shell cat $(d)soname.txt)
 
-this_srcs := $(call prorab-src-dir, $(this_name))
+this_srcs := $(call prorab-src-dir, $(this_src_dir))
 
 this_cxxflags += -isystem ../src_deps
 
@@ -24,8 +25,6 @@ endif
 
 $(eval $(prorab-build-lib))
 
-this_src_dir := $(this_name)
-
 $(eval $(prorab-clang-format))
 
 this_license_file := ../LICENSE

tests/fs_file/makefile

@@ -7,19 +7,21 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lpapki -lutki
-this_ldflags += -L$(d)../../src/out/$(c)
+this_ldlibs += -lutki$(this_dbg)
+
+this__libpapki += ../../src/out/$(c)/libpapki$(this_dbg)$(dot_so)
+
+this_ldlibs += $(this__libpapki)
 
 this_no_install := true
 
 $(eval $(prorab-build-app))
 
-# add dependency on libpapki.so/dll
-$(prorab_this_name): $(abspath $(d)../../src/out/$(c)/libpapki$(dot_so))
-
 this_test_cmd := $(prorab_this_name)
-this_test_deps := $(prorab_this_name)
+this_test_deps := $(prorab_this_name) $(this__libpapki)
 this_test_ld_path := ../../src/out/$(c)
+
+# TODO: is needed?
 # for conan
 this_test_ld_path += $(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))
 

tests/load_whole_file/makefile

@@ -7,19 +7,21 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lpapki -lutki
-this_ldflags += -L$(d)../../src/out/$(c)
+this_ldlibs += -l utki$(this_dbg)
+
+this__libpapki := ../../src/out/$(c)/libpapki$(this_dbg)$(dot_so)
+
+this_ldlibs += $(this__libpapki)
 
 this_no_install := true
 
 $(eval $(prorab-build-app))
 
-# add dependency on libpapki.so
-$(prorab_this_name): $(abspath $(d)../../src/out/$(c)/libpapki$(dot_so))
-
 this_test_cmd := $(prorab_this_name)
-this_test_deps := $(prorab_this_name)
+this_test_deps := $(prorab_this_name) $(this__libpapki)
 this_test_ld_path := ../../src/out/$(c)
+
+# TODO: is needed?
 # for conan
 this_test_ld_path += $(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))
 

tests/span_file/makefile

@@ -7,23 +7,25 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lpapki -lutki
-this_ldflags += -L$(d)../../src/out/$(c)
+this_ldlibs += -l utki$(this_dbg)
+
+this__libpapki := ../../src/out/$(c)/libpapki$(this_dbg)$(dot_so)
+
+this_ldlibs += $(this__libpapki)
 
 this_no_install := true
 
 $(eval $(prorab-build-app))
 
-# add dependency on libpapki.so
-$(prorab_this_name): $(abspath $(d)../../src/out/$(c)/libpapki$(dot_so))
-
 this_test_cmd := $(prorab_this_name)
-this_test_deps := $(prorab_this_name)
+this_test_deps := $(prorab_this_name) $(this__libpapki)
 this_test_ld_path := ../../src/out/$(c)
+
+# TODO: is needed?
 # for conan
 this_test_ld_path += $(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))
 
 $(eval $(prorab-test))
 
 # include makefile for building papki
-$(eval $(call prorab-include,../../src/makefile))
+$(eval $(call prorab-include, ../../src/makefile))

tests/vector_file/makefile

@@ -7,23 +7,25 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lpapki -lutki
-this_ldflags += -L$(d)../../src/out/$(c)
+this_ldlibs += -l utki$(this_dbg)
+
+this__libpapki := ../../src/out/$(c)/libpapki$(this_dbg)$(dot_so)
+
+this_ldlibs += $(this__libpapki)
 
 this_no_install := true
 
 $(eval $(prorab-build-app))
 
-# add dependency on libpapki.so
-$(prorab_this_name): $(abspath $(d)../../src/out/$(c)/libpapki$(dot_so))
-
 this_test_cmd := $(prorab_this_name)
-this_test_deps := $(prorab_this_name)
+this_test_deps := $(prorab_this_name) $(this__libpapki)
 this_test_ld_path := ../../src/out/$(c)
+
+# TODO: is needed?
 # for conan
 this_test_ld_path += $(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))
 
 $(eval $(prorab-test))
 
 # include makefile for building papki
-$(eval $(call prorab-include,../../src/makefile))
+$(eval $(call prorab-include, ../../src/makefile))

tests/zip_file/makefile

@@ -7,19 +7,21 @@ this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lpapki -lutki
-this_ldflags += -L$(d)../../src/out/$(c)
+this_ldlibs += -l utki$(this_dbg)
+
+this__libpapki := ../../src/out/$(c)/libpapki$(this_dbg)$(dot_so)
+
+this_ldlibs += $(this__libpapki)
 
 this_no_install := true
 
 $(eval $(prorab-build-app))
 
-# add dependency on libpapki.so
-$(prorab_this_name): $(abspath $(d)../../src/out/$(c)/libpapki$(dot_so))
-
 this_test_cmd := $(prorab_this_name)
-this_test_deps := $(prorab_this_name)
+this_test_deps := $(prorab_this_name) $(this__libpapki)
 this_test_ld_path := ../../src/out/$(c)
+
+# TODO: is needed?
 # for conan
 this_test_ld_path += $(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))