solstice

commit 79b5380061a88a78c9e7ccab112cc1a9c6b953b7
parent d7b7db5c7e1371db3eacc68f3dc942edb1c4c566
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Mon, 18 May 2026 16:29:44 +0200

Fix Makefiles

Diffstat:
M
Makefile
 | 
4
++--
M
Makefile.core
 | 
8
++++----
M
Makefile.prs
 | 
6
+++---
M
Makefile.rcv
 | 
6
+++---

4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ HDR=\
 CFLAGS_CMD = $(CFLAGS_EXE) $(INCS)
 LDFLAGS_CMD = $(LDFLAGS_EXE) -Lsrc -lscore -lsprs -lsrcv $(LIBS)
 
-executable $(CMD_DEP) $(CMD_OBJ): src/.config
+$(CMD_DEP) $(CMD_OBJ): src/.config
 
 executable: libscore libsrcv libsprs $(CMD_DEP)
 	@$(MAKE) -fMakefile $$(for i in $(CMD_DEP); do echo -f $${i}; done) solstice
@@ -78,9 +78,9 @@ src/.config: config.mk
 # Tests
 ################################################################################
 test: executable
-	$(MAKE) -fMakefile.core test
 	$(MAKE) -fMakefile.prs test
 	$(MAKE) -fMakefile.rcv test
+	$(MAKE) -fMakefile.core test
 
 ################################################################################
 # Man pages
diff --git a/Makefile.core b/Makefile.core
@@ -126,7 +126,7 @@ TEST_TGT =\
 
 src/score-local.pc: score.pc.in src/.config_score_test
 	sed -e '1d'\
-	    -e 's#^includedir=.*#includedir=./src/#'\
+	    -e 's#^includedir=.*#includedir=./src#'\
 	    -e 's#^libdir=.*#libdir=./#'\
 	    -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
 	    -e 's#@S3DUT_VERSION@#$(S3DUT_VERSION)#g'\
@@ -139,8 +139,8 @@ src/score-local.pc: score.pc.in src/.config_score_test
 
 # Regular cflags
 PKG_CONFIG_LOCAL = PKG_CONFIG_PATH="./src:$${PKG_CONFIG_PATH}" $(PKG_CONFIG)
-INCS_TEST = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags rsys score-local sprs srcv)
-LIBS_TEST = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs   rsys score-local sprs srcv)\
+INCS_TEST = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags rsys score-local sprs-local srcv-local)
+LIBS_TEST = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs   rsys score-local sprs-local srcv-local)\
 	    -lm
 
 tests: library src/score-local.pc $(TEST_DEP) $(TEST_TGT)
@@ -215,7 +215,7 @@ test: tests
 # Regular tests
 ################################################################################
 CFLAGS_TEST = $(CFLAGS_EXE) $(INCS_TEST)
-LDFLAGS_TEST = $(LDFLAGS_EXE) -Lsrc -lsprs -Lsrcv $(LIBS_TEST)
+LDFLAGS_TEST = $(LDFLAGS_EXE) $(LIBS_TEST)
 
 $(TEST_DEP) : src/.config_score_test src/score-local.pc
 	@$(CC) $(CFLAGS_TEST) -MM -MT "$(@:.d=.o) $@" $(@:.d=.c) -MF $@
diff --git a/Makefile.prs b/Makefile.prs
@@ -75,7 +75,7 @@ src/.config_prs: config.mk
 	$(PKG_CONFIG) --exists                           yaml-0.1
 	@echo "config done" > $@
 
-install: library pkg
+install: library
 
 uninstall:
 
@@ -109,8 +109,8 @@ TEST_TGT =\
 
 src/sprs-local.pc: sprs.pc.in config.mk
 	sed -e '1d'\
-	    -e 's#^includedir=.*#includedir=./src/#'\
-	    -e 's#^libdir=.*#libdir=./#'\
+	    -e 's#^includedir=.*#includedir=./src#'\
+	    -e 's#^libdir=.*#libdir=./src#'\
 	    -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
 	    -e 's#@S3DUT_VERSION@#$(S3DUT_VERSION)#g'\
 	    -e 's#@SSP_VERSION@#$(SSP_VERSION)#g'\
diff --git a/Makefile.rcv b/Makefile.rcv
@@ -47,7 +47,7 @@ $(LIBNAME): src/libsrcv.o
 	$(AR) -rc $@ $?
 	$(RANLIB) $@
 
-src/libsrcv.o: src/.config_rcv $(OBJ) $(DEP)
+src/libsrcv.o: $(OBJ) $(DEP)
 	$(LD) -r $(OBJ) -o $@
 	$(OBJCOPY) $(OCPFLAGS) $@
 
@@ -90,8 +90,8 @@ TEST_TGT =\
 
 src/srcv-local.pc: srcv.pc.in src/.config_srcv_test
 	sed -e '1d'\
-	    -e 's#^includedir=.*#includedir=./src/#'\
-	    -e 's#^libdir=.*#libdir=./#'\
+	    -e 's#^includedir=.*#includedir=./src#'\
+	    -e 's#^libdir=.*#libdir=./src#'\
 	    -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
 	    -e 's#@YAML_VERSION@#$(YAML_VERSION)#g'\
 	    srcv.pc.in > $@