summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--.gitignore1
-rw-r--r--Makefile11
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index aa36ff7..1e016e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1# Files I don't care to see in git-status/commit 1# Files I don't care to see in git-status/commit
2cgit 2cgit
3cgit.conf 3cgit.conf
4VERSION 4VERSION
5*.o 5*.o
6*.d
diff --git a/Makefile b/Makefile
index d1950cb..faf7b98 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,19 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
10# 10#
11# Let the user override the above settings. 11# Let the user override the above settings.
12# 12#
13-include cgit.conf 13-include cgit.conf
14 14
15 15
16#
17# Define a pattern rule for automatic dependency building
18#
19%.d: %.c
20 $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
21
22
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 23EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = 24OBJECTS =
18OBJECTS += cache.o 25OBJECTS += cache.o
19OBJECTS += cgit.o 26OBJECTS += cgit.o
20OBJECTS += cmd.o 27OBJECTS += cmd.o
21OBJECTS += html.o 28OBJECTS += html.o
@@ -58,12 +65,14 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
58 65
59cgit: $(OBJECTS) 66cgit: $(OBJECTS)
60 $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 67 $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
61 68
62$(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION 69$(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION
63 70
71-include $(OBJECTS:.o=.d)
72
64git/xdiff/lib.a: | git 73git/xdiff/lib.a: | git
65 74
66git/libgit.a: | git 75git/libgit.a: | git
67 76
68git: 77git:
69 cd git && $(MAKE) xdiff/lib.a 78 cd git && $(MAKE) xdiff/lib.a
@@ -81,13 +90,13 @@ install: all
81uninstall: 90uninstall:
82 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 91 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
83 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 92 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
84 rm -f $(CGIT_SCRIPT_PATH)/cgit.png 93 rm -f $(CGIT_SCRIPT_PATH)/cgit.png
85 94
86clean: 95clean:
87 rm -f cgit VERSION *.o 96 rm -f cgit VERSION *.o *.d
88 cd git && $(MAKE) clean 97 cd git && $(MAKE) clean
89 98
90distclean: clean 99distclean: clean
91 git clean -d -x 100 git clean -d -x
92 cd git && git clean -d -x 101 cd git && git clean -d -x
93 102