More make file fixes

Signed-off-by: Erez Geva <ErezGeva2@gmail.com>

Makefile

@@ -832,7 +832,8 @@ CLEAN:=$(wildcard */*.o */*/*.o archlinux/*.pkg.tar.zst\
   wrappers/python/*.pyc wrappers/php/*.h wrappers/php/*.ini wrappers/perl/*.pm\
   wrappers/go/*/go.mod */$(LIB_SRC) wrappers/*/$(SWIG_NAME).cpp\
   wrappers/*/$(SWIG_NAME).h tools/doxygen*cfg $(CLKMGR_DIR)/utest/utest_*\
-  */*/$(LIB_SRC) $(CLKMGR_DIR)/*/*.lo) $(D_FILES) $(LIB_SRC)\
+  */*/$(LIB_SRC) $(CLKMGR_DIR)/*/*.lo $(CLKMGR_DIR)/sample/clkmgr*test)\
+  $(D_FILES) $(LIB_SRC)\
   $(ARCHL_BLD) tags wrappers/python/$(SWIG_LNAME).py $(PHP_LNAME).php $(PMC_NAME)\
   wrappers/tcl/pkgIndex.tcl wrappers/php/.phpunit.result.cache\
   .phpunit.result.cache wrappers/go/allocTlv.i $(CLKMGR_PROXY)\

clkmgr/Makefile

@@ -26,7 +26,8 @@ CLKMGR_CXXFLAGS:=-I$(CLKMGR_PUB_DIR) -I$(CLKMGR_DIR)
 
 CLKMGR_COMMON_SRCS:=$(wildcard $(CLKMGR_COMMON_DIR)/*.cpp)
 CLKMGR_COMMON_LOBJS:=$(CLKMGR_COMMON_SRCS:.cpp=.lo)
-CLKMGR_COMMON_OBJS:=$(CLKMGR_COMMON_SRCS:.cpp=.o)
+CLKMGR_COMMON_OBJS:=$(addprefix $(CLKMGR_COMMON_DIR)/$(LIB_D)/,\
+  $(notdir $(CLKMGR_COMMON_SRCS:.cpp=.o)))
 CLKMGR_CLIENT_SRCS:=$(wildcard $(CLKMGR_CLIENT_DIR)/*.cpp)
 CLKMGR_CLIENT_LOBJS:=$(CLKMGR_CLIENT_SRCS:.cpp=.lo)
 CLKMGR_PROXY_SRCS:=$(wildcard $(CLKMGR_PROXY_DIR)/*.cpp)

tools/ci_address.sh

@@ -52,8 +52,13 @@ config_ubuntu()
 }
 build_prepare_ubuntu()
 {
+ local -r url=http://de.archive.ubuntu.com/ubuntu/pool/universe/libr/librtpi
+ local -r aver=1.0.0-3_amd64
+ wget -c $url/librtpi1_$aver.deb
+ wget -c $url/librtpi-dev_$aver.deb
  apt_install libtool libtool-bin autoconf automake nettle-dev libgnutls28-dev\
    chrpath
+ sudo dpkg -i *.deb
  config_ubuntu
  config_report
 }