author | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 19:47:19 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 19:47:19 (UTC) |
commit | 9895925db705c65ee7bc26cd593a5a36ecb7e2a7 (patch) (unidiff) | |
tree | b207b2f561a77c26d7b7cbdb83bb392489845c2c | |
parent | b8a7eb12d459c48943e31762b24b169af8c427a1 (diff) | |
parent | 5b27248301db4b246bcd9977c6c3d2d4497b9ecb (diff) | |
download | cgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.zip cgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.tar.gz cgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -69,61 +69,61 @@ OBJECTS += ui-repolist.o | |||
69 | OBJECTS += ui-shared.o | 69 | OBJECTS += ui-shared.o |
70 | OBJECTS += ui-snapshot.o | 70 | OBJECTS += ui-snapshot.o |
71 | OBJECTS += ui-summary.o | 71 | OBJECTS += ui-summary.o |
72 | OBJECTS += ui-tag.o | 72 | OBJECTS += ui-tag.o |
73 | OBJECTS += ui-tree.o | 73 | OBJECTS += ui-tree.o |
74 | 74 | ||
75 | ifdef NEEDS_LIBICONV | 75 | ifdef NEEDS_LIBICONV |
76 | EXTLIBS += -liconv | 76 | EXTLIBS += -liconv |
77 | endif | 77 | endif |
78 | 78 | ||
79 | 79 | ||
80 | .PHONY: all libgit test install uninstall clean force-version get-git | 80 | .PHONY: all libgit test install uninstall clean force-version get-git |
81 | 81 | ||
82 | all: cgit | 82 | all: cgit |
83 | 83 | ||
84 | VERSION: force-version | 84 | VERSION: force-version |
85 | @./gen-version.sh "$(CGIT_VERSION)" | 85 | @./gen-version.sh "$(CGIT_VERSION)" |
86 | -include VERSION | 86 | -include VERSION |
87 | 87 | ||
88 | 88 | ||
89 | CFLAGS += -g -Wall -Igit | 89 | CFLAGS += -g -Wall -Igit |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
95 | 95 | ||
96 | ifdef NO_ICONV | 96 | ifdef NO_ICONV |
97 | CFLAGS += -DNO_ICONV | 97 | CFLAGS += -DNO_ICONV |
98 | endif | 98 | endif |
99 | 99 | ||
100 | cgit: $(OBJECTS) libgit | 100 | cgit: $(OBJECTS) libgit |
101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
102 | 102 | ||
103 | cgit.o: VERSION | 103 | cgit.o: VERSION |
104 | 104 | ||
105 | -include $(OBJECTS:.o=.d) | 105 | -include $(OBJECTS:.o=.d) |
106 | 106 | ||
107 | libgit: | 107 | libgit: |
108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | 108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
109 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 109 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
110 | 110 | ||
111 | test: all | 111 | test: all |
112 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 112 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
113 | 113 | ||
114 | install: all | 114 | install: all |
115 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 115 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
116 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 116 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
117 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 117 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
118 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 118 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
119 | 119 | ||
120 | uninstall: | 120 | uninstall: |
121 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 121 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
122 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 122 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
123 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 123 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
124 | 124 | ||
125 | clean: | 125 | clean: |
126 | rm -f cgit VERSION *.o *.d | 126 | rm -f cgit VERSION *.o *.d |
127 | 127 | ||
128 | get-git: | 128 | get-git: |
129 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 129 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |