diff options
author | Lars Hjemli | 2008-03-24 20:49:41 +0100 |
---|---|---|
committer | Lars Hjemli | 2008-03-24 23:16:30 +0100 |
commit | 271818693d6803b5df25ee87570808c2a9dbd7e7 (patch) | |
tree | b7dae11111bbbc857abe36934eff5ec1a202913e | |
parent | Move non-generic functions from shared.c to cgit.c (diff) | |
download | cgit-271818693d6803b5df25ee87570808c2a9dbd7e7.tar.gz cgit-271818693d6803b5df25ee87570808c2a9dbd7e7.zip |
Initial Makefile cleanup
Sort the list of object files to improve readability/mergeability and remove manual dependency information which will soon be generated automatically. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/Makefile b/Makefile index d9ff7d8..d1950cb 100644 --- a/Makefile +++ b/Makefile | |||
@@ -14,10 +14,25 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |||
14 | 14 | ||
15 | 15 | ||
16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 17 | OBJECTS = |
18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ | 18 | OBJECTS += cache.o |
19 | ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o cmd.o | 19 | OBJECTS += cgit.o |
20 | 20 | OBJECTS += cmd.o | |
21 | OBJECTS += html.o | ||
22 | OBJECTS += parsing.o | ||
23 | OBJECTS += shared.o | ||
24 | OBJECTS += ui-blob.o | ||
25 | OBJECTS += ui-commit.o | ||
26 | OBJECTS += ui-diff.o | ||
27 | OBJECTS += ui-log.o | ||
28 | OBJECTS += ui-patch.o | ||
29 | OBJECTS += ui-refs.o | ||
30 | OBJECTS += ui-repolist.o | ||
31 | OBJECTS += ui-shared.o | ||
32 | OBJECTS += ui-snapshot.o | ||
33 | OBJECTS += ui-summary.o | ||
34 | OBJECTS += ui-tag.o | ||
35 | OBJECTS += ui-tree.o | ||
21 | 36 | ||
22 | ifdef NEEDS_LIBICONV | 37 | ifdef NEEDS_LIBICONV |
23 | EXTLIBS += -liconv | 38 | EXTLIBS += -liconv |
@@ -41,10 +56,10 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | |||
41 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 56 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
42 | 57 | ||
43 | 58 | ||
44 | cgit: cgit.c $(OBJECTS) | 59 | cgit: $(OBJECTS) |
45 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) | 60 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
46 | 61 | ||
47 | $(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION | 62 | $(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION |
48 | 63 | ||
49 | git/xdiff/lib.a: | git | 64 | git/xdiff/lib.a: | git |
50 | 65 | ||