aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile31
2 files changed, 9 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 28213ee..f58df71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
/tests/test-profiles/
/remembering
/src/remembering-c
-/remembering-sh
+/src/remembering
/remembering-test.*
/run-tests
/fallible*
diff --git a/Makefile b/Makefile
index fd8e5a1..ff8ec58 100644
--- a/Makefile
+++ b/Makefile
@@ -8,28 +8,17 @@ NAME = remembering
MAILING_LIST = public-inbox
TRANSLATIONS = pt fr eo
-sources = src/remembering.c
+.SUFFIXES: .in
-all: remembering run-tests
+.in:
+ sed -e 's:@VERSION@:$(VERSION):g' -e 's:@DATE@:$(DATE):g' < $< > $@
-remembering: remembering-sh
- cp $? $@
+all: src/remembering src/remembering-c
-remembering-sh: src/remembering.sh
- $(do_subst) < $? > $@-t
- chmod +x $@-t
- mv $@-t $@
+run-tests: src/remembering-c.c
+ $(CC) $(CFLAGS) $(DEFS) $(LDFLAGS) -DTEST -o $@ $? $(LDLIBS)
-remembering-c: $(sources)
- $(CC) $(CFLAGS) $(DEFS) $(LDFLAGS) -o $@ $(sources) $(LDLIBS)
-
-run-tests: $(sources)
- $(CC) $(CFLAGS) $(DEFS) $(LDFLAGS) -DTEST -o $@ $(sources) $(LDLIBS)
-
-fallible-tests: $(sources)
- $(CC) $(CFLAGS) $(DEFS) $(LDFLAGS) -DTEST -DFALLIBLE -o $@ $(sources) $(LDLIBS) -lfallible
-
-check: all
+check: all run-tests
./run-tests
sh tests/cli-opts.sh
sh tests/ranking.sh
@@ -46,11 +35,7 @@ dev-check: check fallible-tests
sh aux/workflow/assert-manpages.sh $(NAME) $(MAILING_LIST)
clean:
- rm -rf public/ tests/test-profiles/ remembering remembering-sh remembering-c run-tests fallible* vgcore* remembering-test.*
-
-do_subst = sed \
- -e 's:[@]VERSION[@]:$(VERSION):g' \
- -e 's:[@]DATE[@]:$(DATE):g'
+ rm -rf public/ tests/test-profiles/ src/remembering src/remembering-c run-tests fallible* vgcore* remembering-test.*
install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin