summaryrefslogtreecommitdiffabout
path: root/Makefile
authorLars Hjemli <hjemli@gmail.com>2008-03-27 23:09:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-27 23:09:11 (UTC)
commit20a33548b9a87a6eb23162ee5d137daa46d78613 (patch) (unidiff)
tree9c4ca364df64dcce640a531c7f515ee48bc99387 /Makefile
parentee4056bd2c902a12dea67874368863fe60ea5a5f (diff)
downloadcgit-20a33548b9a87a6eb23162ee5d137daa46d78613.zip
cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.gz
cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.bz2
Move function for configfile parsing into configfile.[ch]
This is a generic function which wanted its own little object file. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'Makefile') (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 223765d..355186e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,64 +22,65 @@ QUIET_SUBDIR1 =
22ifneq ($(findstring $(MAKEFLAGS),w),w) 22ifneq ($(findstring $(MAKEFLAGS),w),w)
23PRINT_DIR = --no-print-directory 23PRINT_DIR = --no-print-directory
24else # "make -w" 24else # "make -w"
25NO_SUBDIR = : 25NO_SUBDIR = :
26endif 26endif
27 27
28ifndef V 28ifndef V
29 QUIET_CC = @echo ' ' CC $@; 29 QUIET_CC = @echo ' ' CC $@;
30 QUIET_MM = @echo ' ' MM $@; 30 QUIET_MM = @echo ' ' MM $@;
31 QUIET_SUBDIR0 = +@subdir= 31 QUIET_SUBDIR0 = +@subdir=
32 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ 32 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
33 $(MAKE) $(PRINT_DIR) -C $$subdir 33 $(MAKE) $(PRINT_DIR) -C $$subdir
34endif 34endif
35 35
36# 36#
37# Define a pattern rule for automatic dependency building 37# Define a pattern rule for automatic dependency building
38# 38#
39%.d: %.c 39%.d: %.c
40 $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ 40 $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
41 41
42# 42#
43# Define a pattern rule for silent object building 43# Define a pattern rule for silent object building
44# 44#
45%.o: %.c 45%.o: %.c
46 $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< 46 $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
47 47
48 48
49EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 49EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
50OBJECTS = 50OBJECTS =
51OBJECTS += cache.o 51OBJECTS += cache.o
52OBJECTS += cgit.o 52OBJECTS += cgit.o
53OBJECTS += cmd.o 53OBJECTS += cmd.o
54OBJECTS += configfile.o
54OBJECTS += html.o 55OBJECTS += html.o
55OBJECTS += parsing.o 56OBJECTS += parsing.o
56OBJECTS += shared.o 57OBJECTS += shared.o
57OBJECTS += ui-blob.o 58OBJECTS += ui-blob.o
58OBJECTS += ui-commit.o 59OBJECTS += ui-commit.o
59OBJECTS += ui-diff.o 60OBJECTS += ui-diff.o
60OBJECTS += ui-log.o 61OBJECTS += ui-log.o
61OBJECTS += ui-patch.o 62OBJECTS += ui-patch.o
62OBJECTS += ui-refs.o 63OBJECTS += ui-refs.o
63OBJECTS += ui-repolist.o 64OBJECTS += ui-repolist.o
64OBJECTS += ui-shared.o 65OBJECTS += ui-shared.o
65OBJECTS += ui-snapshot.o 66OBJECTS += ui-snapshot.o
66OBJECTS += ui-summary.o 67OBJECTS += ui-summary.o
67OBJECTS += ui-tag.o 68OBJECTS += ui-tag.o
68OBJECTS += ui-tree.o 69OBJECTS += ui-tree.o
69 70
70ifdef NEEDS_LIBICONV 71ifdef NEEDS_LIBICONV
71 EXTLIBS += -liconv 72 EXTLIBS += -liconv
72endif 73endif
73 74
74 75
75.PHONY: all git test install clean distclean emptycache force-version get-git 76.PHONY: all git test install clean distclean emptycache force-version get-git
76 77
77all: cgit git 78all: cgit git
78 79
79VERSION: force-version 80VERSION: force-version
80 @./gen-version.sh "$(CGIT_VERSION)" 81 @./gen-version.sh "$(CGIT_VERSION)"
81-include VERSION 82-include VERSION
82 83
83 84
84CFLAGS += -g -Wall -Igit 85CFLAGS += -g -Wall -Igit
85CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 86CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'