Add the simple scripts I used to do a merge with content conflicts.
[git/git.git] / Makefile
1 # -DCOLLISION_CHECK if you believe that SHA1's
2 # 1461501637330902918203684832716283019655932542976 hashes do not give you
3 # enough guarantees about no collisions between objects ever hapenning.
4 #
5 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
6 # Note that you need some new glibc (at least >2.2.4) for this, and it will
7 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
8 # break unless your underlying filesystem supports those sub-second times
9 # (my ext3 doesn't).
10 CFLAGS=-g -O3 -Wall
11
12 CC=gcc
13
14
15 PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
16 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
17 check-files ls-tree merge-base merge-cache
18
19 all: $(PROG)
20
21 install: $(PROG)
22 install $(PROG) $(HOME)/bin/
23
24 LIBS= -lssl -lz
25
26 init-db: init-db.o
27
28 update-cache: update-cache.o read-cache.o
29 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
30
31 show-diff: show-diff.o read-cache.o
32 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
33
34 write-tree: write-tree.o read-cache.o
35 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
36
37 read-tree: read-tree.o read-cache.o
38 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
39
40 commit-tree: commit-tree.o read-cache.o
41 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
42
43 cat-file: cat-file.o read-cache.o
44 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
45
46 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
47 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
48
49 checkout-cache: checkout-cache.o read-cache.o
50 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
51
52 diff-tree: diff-tree.o read-cache.o
53 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
54
55 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
56 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
57
58 show-files: show-files.o read-cache.o
59 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
60
61 check-files: check-files.o read-cache.o
62 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
63
64 ls-tree: ls-tree.o read-cache.o
65 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
66
67 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
68 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
69
70 merge-cache: merge-cache.o read-cache.o
71 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
72
73 read-cache.o: cache.h
74 show-diff.o: cache.h
75
76 clean:
77 rm -f *.o $(PROG)
78
79 backup: clean
80 cd .. ; tar czvf dircache.tar.gz dir-cache