author | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
commit | 20a33548b9a87a6eb23162ee5d137daa46d78613 (patch) (unidiff) | |
tree | 9c4ca364df64dcce640a531c7f515ee48bc99387 /Makefile | |
parent | ee4056bd2c902a12dea67874368863fe60ea5a5f (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,64 +22,65 @@ QUIET_SUBDIR1 = | |||
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
23 | PRINT_DIR = --no-print-directory | 23 | PRINT_DIR = --no-print-directory |
24 | else # "make -w" | 24 | else # "make -w" |
25 | NO_SUBDIR = : | 25 | NO_SUBDIR = : |
26 | endif | 26 | endif |
27 | 27 | ||
28 | ifndef V | 28 | ifndef 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 |
34 | endif | 34 | endif |
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 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | ||
54 | OBJECTS += html.o | 55 | OBJECTS += html.o |
55 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
56 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
57 | OBJECTS += ui-blob.o | 58 | OBJECTS += ui-blob.o |
58 | OBJECTS += ui-commit.o | 59 | OBJECTS += ui-commit.o |
59 | OBJECTS += ui-diff.o | 60 | OBJECTS += ui-diff.o |
60 | OBJECTS += ui-log.o | 61 | OBJECTS += ui-log.o |
61 | OBJECTS += ui-patch.o | 62 | OBJECTS += ui-patch.o |
62 | OBJECTS += ui-refs.o | 63 | OBJECTS += ui-refs.o |
63 | OBJECTS += ui-repolist.o | 64 | OBJECTS += ui-repolist.o |
64 | OBJECTS += ui-shared.o | 65 | OBJECTS += ui-shared.o |
65 | OBJECTS += ui-snapshot.o | 66 | OBJECTS += ui-snapshot.o |
66 | OBJECTS += ui-summary.o | 67 | OBJECTS += ui-summary.o |
67 | OBJECTS += ui-tag.o | 68 | OBJECTS += ui-tag.o |
68 | OBJECTS += ui-tree.o | 69 | OBJECTS += ui-tree.o |
69 | 70 | ||
70 | ifdef NEEDS_LIBICONV | 71 | ifdef NEEDS_LIBICONV |
71 | EXTLIBS += -liconv | 72 | EXTLIBS += -liconv |
72 | endif | 73 | endif |
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 | ||
77 | all: cgit git | 78 | all: cgit git |
78 | 79 | ||
79 | VERSION: force-version | 80 | VERSION: force-version |
80 | @./gen-version.sh "$(CGIT_VERSION)" | 81 | @./gen-version.sh "$(CGIT_VERSION)" |
81 | -include VERSION | 82 | -include VERSION |
82 | 83 | ||
83 | 84 | ||
84 | CFLAGS += -g -Wall -Igit | 85 | CFLAGS += -g -Wall -Igit |
85 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 86 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |