summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rwxr-xr-xscripts/generate-revision8
-rw-r--r--src/main/main.c3
3 files changed, 4 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index aac5f42..cfb430a 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,6 @@ CFLAGS ?= -g -O2
CFLAGS += -Werror -Wall -Wextra -std=c99\
-I $(.CURDIR)/src\
-I $(.CURDIR)/src/main\
- -I $(.OBJDIR)/src\
- -I $(.OBJDIR)/src/main\
-DDATADIR="$(prefix)/$(datadir)"\
-DTEST_ROOT="$(.CURDIR)/test"
@@ -122,24 +120,19 @@ FILES = $(DEPS) \
$(MAIN_OBJS) \
$(OBJS) \
$(TEST_OBJS) \
- src/main/revision.h \
dged \
libdged.a
-src/main/revision.h: scripts/generate-revision
- @$(.CURDIR)/scripts/generate-revision $@
-
# dependency generation
-.c.d: config.mk src/main/revision.h
+.c.d: config.mk
@mkdir -p $(@D)
$(CC) -MM $(CFLAGS) -MT $*.o $< > $@
@sed -i 's,\($*\)\.o[ :]*,\1.o $@ : ,g' $@
-.c.o: config.mk src/main/revision.h
+.c.o: config.mk
@mkdir -p $(@D)
$(CC) $(CFLAGS) -c $< -o $@
-# TODO: remove this
grammars:
@if [ "$(SYNTAX_ENABLE)" = "true" ] && [ -n "$$BUNDLE_TREESITTER_GRAMMARS" ]; then \
IFS=":"; for p in "$$BUNDLE_TREESITTER_GRAMMARS"; do \
@@ -149,7 +142,7 @@ grammars:
mkdir -p ./grammars; \
fi
-dged: src/main/revision.h $(MAIN_OBJS) libdged.a grammars
+dged: $(MAIN_OBJS) libdged.a grammars
$(CC) $(LDFLAGS) $(MAIN_OBJS) libdged.a -o dged -lm
libdged.a: $(OBJS)
diff --git a/scripts/generate-revision b/scripts/generate-revision
deleted file mode 100755
index 9698141..0000000
--- a/scripts/generate-revision
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-rev="$(git rev-parse --verify --quiet HEAD)"
-cat << EOF > "$1"
-#ifndef _REVISION_H
-#define _REVISION_H
-#define DGED_REVISION "$rev"
-#endif
-EOF
diff --git a/src/main/main.c b/src/main/main.c
index e9f7938..70c62a3 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -39,7 +39,6 @@
#include "cmds.h"
#include "completion.h"
#include "frame-hooks.h"
-#include "revision.h"
#include "version.h"
/* welcome.h is generated from welcome.inc with
@@ -170,7 +169,7 @@ static void usage(void) {
}
static void version(void) {
- printf("dged - %s (%s)\n© Albert Cervin 2025\n", DGED_VERSION, DGED_REVISION);
+ printf("dged - %s\n© Albert Cervin 2024\n", DGED_VERSION);
}
int main(int argc, char *argv[]) {