diff options
context:
space:
mode:
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Trim the comments and dead code across the tree
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 file changed, 14 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c0d6f7d..b22beb9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ BUILDDIR = build
CGIT_ROOT = ../..
# The Git release that get-git fetches when the submodule is not checked out.
-# Keep it in step with the submodule pin in .gitmodules.
+# Keep it in step with the commit the submodule is pinned to.
GIT_VERSION = 2.55.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VERSION).tar.xz
@@ -42,7 +42,11 @@ filterdir = $(libdir)/cgit/filters
# The files that go into the data path and the filter directory. One list each
# drives both install and uninstall, so the two can never drift apart.
-ASSETS = cgit.css cgit.js cgit.png favicon.ico robots.txt
+ASSETS = cgit.css
+ASSETS += cgit.js
+ASSETS += cgit.png
+ASSETS += favicon.ico
+ASSETS += robots.txt
FILTER_FILES = $(notdir $(wildcard $(EXTDIR)/*.lua))
INSTALL = install
@@ -52,7 +56,8 @@ INSTALL = install
-include $(GITDIR)/config.mak.uname
-include cgit.conf
-export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
+export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH
+export CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
all: cgit
@@ -81,11 +86,14 @@ cgit-with-git:
install: all
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
- $(INSTALL) -m 0755 $(BUILDDIR)/cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+ $(INSTALL) -m 0755 $(BUILDDIR)/cgit \
+ $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
- $(INSTALL) -m 0644 $(addprefix $(ASSETDIR)/,$(ASSETS)) $(DESTDIR)$(CGIT_DATA_PATH)
+ $(INSTALL) -m 0644 $(addprefix $(ASSETDIR)/,$(ASSETS)) \
+ $(DESTDIR)$(CGIT_DATA_PATH)
$(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
- $(INSTALL) -m 0644 $(EXTDIR)/*.lua $(DESTDIR)$(filterdir)
+ $(INSTALL) -m 0644 $(addprefix $(EXTDIR)/,$(FILTER_FILES)) \
+ $(DESTDIR)$(filterdir)
uninstall:
$(RM) $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
@@ -111,7 +119,6 @@ tags:
@mkdir -p $(BUILDDIR)
find $(SRCDIR) -name '*.[ch]' | xargs ctags -f $(BUILDDIR)/tags
-# Grouped to mirror the order of the targets above.
.PHONY: all cgit cgit-with-git sparse test
.PHONY: install uninstall
.PHONY: clean cleanall get-git tags