Add the simple scripts I used to do a merge with content conflicts.
[git/git.git] / Makefile
CommitLineData
5c2a7fbc
PB
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.
bdd4da59
PB
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).
19b2860c 10CFLAGS=-g -O3 -Wall
5c2a7fbc 11
e83c5163
LT
12CC=gcc
13
bdd4da59 14
7912c070 15PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
74b46e32 16 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
75118b13 17 check-files ls-tree merge-base merge-cache
e83c5163
LT
18
19all: $(PROG)
20
21install: $(PROG)
22 install $(PROG) $(HOME)/bin/
23
94261677 24LIBS= -lssl -lz
e83c5163
LT
25
26init-db: init-db.o
27
28update-cache: update-cache.o read-cache.o
29 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
30
31show-diff: show-diff.o read-cache.o
32 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
33
34write-tree: write-tree.o read-cache.o
35 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
36
37read-tree: read-tree.o read-cache.o
38 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
39
40commit-tree: commit-tree.o read-cache.o
41 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
42
43cat-file: cat-file.o read-cache.o
44 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
45
ff5ebe39
DB
46fsck-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)
7660a188 48
33db5f4d
LT
49checkout-cache: checkout-cache.o read-cache.o
50 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
51
9174026c
LT
52diff-tree: diff-tree.o read-cache.o
53 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
54
5873b67e
DB
55rev-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)
84fe9720 57
8695c8bf
LT
58show-files: show-files.o read-cache.o
59 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
60
74b46e32
LT
61check-files: check-files.o read-cache.o
62 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
63
7912c070
PB
64ls-tree: ls-tree.o read-cache.o
65 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
66
b5039db6
DB
67merge-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)
6683463e 69
75118b13
LT
70merge-cache: merge-cache.o read-cache.o
71 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
72
e83c5163
LT
73read-cache.o: cache.h
74show-diff.o: cache.h
75
76clean:
42d545e8 77 rm -f *.o $(PROG)
e83c5163
LT
78
79backup: clean
80 cd .. ; tar czvf dircache.tar.gz dir-cache