summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-11-06 19:47:19 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-11-06 19:47:19 (UTC)
commit9895925db705c65ee7bc26cd593a5a36ecb7e2a7 (patch) (unidiff)
treeb207b2f561a77c26d7b7cbdb83bb392489845c2c
parentb8a7eb12d459c48943e31762b24b169af8c427a1 (diff)
parent5b27248301db4b246bcd9977c6c3d2d4497b9ecb (diff)
downloadcgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.zip
cgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.tar.gz
cgit-9895925db705c65ee7bc26cd593a5a36ecb7e2a7.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f79688c..2107610 100644
--- a/Makefile
+++ b/Makefile
@@ -69,61 +69,61 @@ OBJECTS += ui-repolist.o
69OBJECTS += ui-shared.o 69OBJECTS += ui-shared.o
70OBJECTS += ui-snapshot.o 70OBJECTS += ui-snapshot.o
71OBJECTS += ui-summary.o 71OBJECTS += ui-summary.o
72OBJECTS += ui-tag.o 72OBJECTS += ui-tag.o
73OBJECTS += ui-tree.o 73OBJECTS += ui-tree.o
74 74
75ifdef NEEDS_LIBICONV 75ifdef NEEDS_LIBICONV
76 EXTLIBS += -liconv 76 EXTLIBS += -liconv
77endif 77endif
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
82all: cgit 82all: cgit
83 83
84VERSION: force-version 84VERSION: force-version
85 @./gen-version.sh "$(CGIT_VERSION)" 85 @./gen-version.sh "$(CGIT_VERSION)"
86-include VERSION 86-include VERSION
87 87
88 88
89CFLAGS += -g -Wall -Igit 89CFLAGS += -g -Wall -Igit
90CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 90CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
91CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 91CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
92CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 92CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
93CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 93CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
94CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 94CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
95 95
96ifdef NO_ICONV 96ifdef NO_ICONV
97 CFLAGS += -DNO_ICONV 97 CFLAGS += -DNO_ICONV
98endif 98endif
99 99
100cgit: $(OBJECTS) libgit 100cgit: $(OBJECTS) libgit
101 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 101 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
102 102
103cgit.o: VERSION 103cgit.o: VERSION
104 104
105-include $(OBJECTS:.o=.d) 105-include $(OBJECTS:.o=.d)
106 106
107libgit: 107libgit:
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
111test: all 111test: all
112 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 112 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
113 113
114install: all 114install: 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
120uninstall: 120uninstall:
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
125clean: 125clean:
126 rm -f cgit VERSION *.o *.d 126 rm -f cgit VERSION *.o *.d
127 127
128get-git: 128get-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