commit 73c132afcd98c51b16777ff35eaee0aa3df45993
parent d089ba08930675eb645cbaa586c72c0b6b815a52
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 27 Jul 2023 16:01:26 +0200
Small updates to the Makefile
Don't hide the sed commands that generate the pkg-config files. There's
no particular advantage to hiding them, but it's still healthy to see
what's going on. Similarly, don't hide the clean_test target command.
Finally, the SMS_FOUND macro was not being used when it should be, and
this commit corrects that.
Diffstat:
| M | Makefile | | | 29 | ++++++++++++++--------------- |
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
@@ -69,21 +69,20 @@ $(LIBNAME_STATIC): $(OBJ)
# Installation
################################################################################
pkg:
- @echo "Setup suvm.pc"
- @sed -e 's#@PREFIX@#$(PREFIX)#g'\
- -e 's#@VERSION@#$(VERSION)#g'\
- -e 's#@EMBREE_VERSION@#$(EMBREE_VERSION)#g'\
- -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
- suvm.pc.in > suvm.pc
+ sed -e 's#@PREFIX@#$(PREFIX)#g'\
+ -e 's#@VERSION@#$(VERSION)#g'\
+ -e 's#@EMBREE_VERSION@#$(EMBREE_VERSION)#g'\
+ -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
+ suvm.pc.in > suvm.pc
suvm-local.pc: suvm.pc.in
- @sed -e '1d'\
- -e 's#^includedir=.*#includedir=./src/#'\
- -e 's#^libdir=.*#libdir=./#'\
- -e 's#@VERSION@#$(VERSION)#g'\
- -e 's#@EMBREE_VERSION@#$(EMBREE_VERSION)#g'\
- -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
- suvm.pc.in > $@
+ sed -e '1d'\
+ -e 's#^includedir=.*#includedir=./src/#'\
+ -e 's#^libdir=.*#libdir=./#'\
+ -e 's#@VERSION@#$(VERSION)#g'\
+ -e 's#@EMBREE_VERSION@#$(EMBREE_VERSION)#g'\
+ -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
+ suvm.pc.in > $@
install: build_library pkg
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/lib" $(LIBNAME)
@@ -140,12 +139,12 @@ test: build_tests
.test: Makefile
@{ $(SHELL) make.sh config_test $(TEST_SRC); \
- if $(PKG_CONFIG) --atleast-version $(SMSH_VERSION) smsh; then \
+ if $(SMSH_FOUND); then \
$(SHELL) make.sh config_test src/suvm_voxelize.c; fi \
} > $@
clean_test:
- @$(SHELL) make.sh clean_test $(TEST_SRC) src/suvm_voxelize.c
+ $(SHELL) make.sh clean_test $(TEST_SRC) src/suvm_voxelize.c
$(TEST_DEP): config.mk suvm-local.pc
@$(CC) -std=c89 $(CFLAGS) $(RSYS_CFLAGS) $(SUVM_CFLAGS) \
