|
|
|
@@ -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 |
2 | cgit |
2 | cgit |
3 | cgit.conf |
3 | cgit.conf |
4 | VERSION |
4 | VERSION |
5 | *.o |
5 | *.o |
| |
6 | *.d |
|
|
diff --git a/Makefile b/Makefile index d1950cb..faf7b98 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -8,16 +8,23 @@ GIT_VER = 1.5.4.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | |
9 | |
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 | |
16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
17 | OBJECTS = |
24 | OBJECTS = |
18 | OBJECTS += cache.o |
25 | OBJECTS += cache.o |
19 | OBJECTS += cgit.o |
26 | OBJECTS += cgit.o |
20 | OBJECTS += cmd.o |
27 | OBJECTS += cmd.o |
21 | OBJECTS += html.o |
28 | OBJECTS += html.o |
22 | OBJECTS += parsing.o |
29 | OBJECTS += parsing.o |
23 | OBJECTS += shared.o |
30 | OBJECTS += shared.o |
@@ -56,16 +63,18 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
56 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
63 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
57 | |
64 | |
58 | |
65 | |
59 | cgit: $(OBJECTS) |
66 | cgit: $(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 | |
64 | git/xdiff/lib.a: | git |
73 | git/xdiff/lib.a: | git |
65 | |
74 | |
66 | git/libgit.a: | git |
75 | git/libgit.a: | git |
67 | |
76 | |
68 | git: |
77 | git: |
69 | cd git && $(MAKE) xdiff/lib.a |
78 | cd git && $(MAKE) xdiff/lib.a |
70 | cd git && $(MAKE) libgit.a |
79 | cd git && $(MAKE) libgit.a |
71 | |
80 | |
@@ -79,17 +88,17 @@ install: all |
79 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
88 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
80 | |
89 | |
81 | uninstall: |
90 | uninstall: |
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 | |
86 | clean: |
95 | clean: |
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 | |
90 | distclean: clean |
99 | distclean: 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 | |
94 | emptycache: |
103 | emptycache: |
95 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* |
104 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* |
|