fix noble

.github/workflows/ci.yml

@@ -124,7 +124,7 @@ jobs:
           - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
           - {os: ubuntu, codename: focal, image_owner: }
           - {os: ubuntu, codename: jammy, image_owner: }
-          - {os: ubuntu, codename: nobel, image_owner: }
+          - {os: ubuntu, codename: noble, image_owner: }
           # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
           # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
           - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}

doc/doxygen.cfg.in

@@ -1648,16 +1648,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1981,15 +1971,6 @@ EXTERNAL_PAGES         = YES
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2048,7 +2029,6 @@ DOT_FONTPATH           =
 
 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
 # each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 

src/makefile

@@ -3,8 +3,6 @@ include prorab-license.mk
 include prorab-clang-format.mk
 include prorab-install-dbgsrc.mk
 
-$(eval $(call prorab-try-simple-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
-
 $(eval $(call prorab-config, ../config))
 
 this_name := cssom
@@ -13,10 +11,6 @@ this_soname := $(shell cat $(d)soname.txt)
 
 this_srcs := $(call prorab-src-dir,.)
 
-this_cxxflags += $(addprefix -I,$(CONAN_INCLUDE_DIRS))
-this_cxxflags_test += $(addprefix -I,$(CONAN_INCLUDE_DIRS))
-this_ldflags += $(addprefix -L,$(CONAN_LIB_DIRS))
-
 this_ldlibs += -lpapki -lutki
 
 $(eval $(prorab-build-lib))

tests/harness/makefile

@@ -1,8 +1,6 @@
 include prorab.mk
 include prorab-test.mk
 
-$(eval $(call prorab-try-simple-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
-
 $(eval $(call prorab-config, ../../config))
 
 this_name := harness
@@ -14,9 +12,6 @@ this_srcs += $(call prorab-src-dir, .)
 this_ldlibs += -lcssom -lpapki
 this_ldflags += -L$(d)../../src/out/$(c)
 
-this_cxxflags += $(addprefix -I,$(CONAN_INCLUDE_DIRS))
-this_ldflags += $(addprefix -L,$(CONAN_LIB_DIRS))
-
 this_no_install := true
 
 $(eval $(prorab-build-lib))

tests/unit/makefile

@@ -1,21 +1,17 @@
 include prorab.mk
 include prorab-test.mk
 
-$(eval $(call prorab-try-simple-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
-
 $(eval $(call prorab-config, ../../config))
 
 this_name := tests
 
 this_srcs += $(call prorab-src-dir, .)
 
-this_ldlibs += -lharness -lcssom -lpapki -lutki -ltst $(addprefix -l,$(CONAN_LIBS))
+this_ldlibs += -lharness -lcssom -lpapki -lutki -ltst
 this_ldflags += -L$(d)../../src/out/$(c)
 this_ldflags += -L$(d)../harness/out/$(c)
 
 this_cxxflags += -isystem ../../src
-this_cxxflags += $(addprefix -I,$(CONAN_INCLUDE_DIRS))
-this_ldflags += $(addprefix -L,$(CONAN_LIB_DIRS))
 
 this_no_install := true
 
@@ -29,7 +25,7 @@ $(prorab_this_name): $(abspath $(d)../harness/out/$(c)/libharness$(dot_so))
 
 this_test_cmd := $(prorab_this_name) --junit-out=out/$(c)/junit.xml
 this_test_deps := $(prorab_this_name)
-this_test_ld_path := ../../src/out/$(c) ../harness/out/$(c) $(CONAN_LIB_DIRS)
+this_test_ld_path := ../../src/out/$(c) ../harness/out/$(c)
 $(eval $(prorab-test))
 
 $(eval $(call prorab-include, ../../src/makefile))