summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2025-01-15 16:34:24 -0300
committerEuAndreh <eu@euandre.org>2025-01-15 16:34:24 -0300
commita890c1f1f5d125574c839def4b70e90cdd637124 (patch)
treefdb0351b332dc723948e7037b413baac228de9e4
parentRevamp lib, simplify it a bit and address some FIXMEs (diff)
downloadpindaiba-a890c1f1f5d125574c839def4b70e90cdd637124.tar.gz
pindaiba-a890c1f1f5d125574c839def4b70e90cdd637124.tar.xz
Makefile: Normalize alongside other projects; fix $(integration-tests)
-rw-r--r--Makefile13
-rwxr-xr-xtests/integration.sh2
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a1f6453..4e7fe4e 100644
--- a/Makefile
+++ b/Makefile
@@ -121,9 +121,12 @@ check-unit: $(tests.bin-check)
integration-tests = \
tests/cli-opts.sh \
+ tests/integration.sh \
-$(integration-tests): $(NAME).bin ALWAYS
- sh $@ $(EXEC)$(NAME).bin
+.PRECIOUS: $(integration-tests)
+$(integration-tests): $(NAME).bin
+$(integration-tests): ALWAYS
+ sh $@
check-integration: $(integration-tests)
@@ -149,12 +152,12 @@ install: all
'$(DESTDIR)$(LIBDIR)' \
'$(DESTDIR)$(SRCDIR)' \
'$(DESTDIR)$(INCLUDEDIR)' \
- '$(DESTDIR)$(INCLUDEDIR)'/$(NAME)/
+ '$(DESTDIR)$(INCLUDEDIR)'/$(NAME)/ \
cp $(NAME).bin '$(DESTDIR)$(BINDIR)'/$(NAME)
cp lib$(NAME).a '$(DESTDIR)$(LIBDIR)'
cp src/$(NAME).h '$(DESTDIR)$(INCLUDEDIR)'
- cp $(sources.h) '$(DESTDIR)$(INCLUDEDIR)'/$(NAME)/
+ cp $(sources.h) '$(DESTDIR)$(INCLUDEDIR)'/$(NAME)
cp $(sources) '$(DESTDIR)$(SRCDIR)'
for c in $(catalogs.cat); do \
l="`echo "$$c" | cut -d. -f2`"; \
@@ -171,7 +174,7 @@ uninstall:
'$(DESTDIR)$(BINDIR)'/$(NAME) \
'$(DESTDIR)$(LIBDIR)'/lib$(NAME).a \
'$(DESTDIR)$(INCLUDEDIR)'/$(NAME).h \
- '$(DESTDIR)$(INCLUDEDIR)'/$(NAME)/ \
+ '$(DESTDIR)$(INCLUDEDIR)'/$(NAME) \
'$(DESTDIR)$(SRCDIR)' \
for c in $(catalogs.cat); do \
diff --git a/tests/integration.sh b/tests/integration.sh
new file mode 100755
index 0000000..92b70ea
--- /dev/null
+++ b/tests/integration.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+set -eu