mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
67cc5c4ef8
Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.
117 lines
3.1 KiB
Makefile
117 lines
3.1 KiB
Makefile
# -DCOLLISION_CHECK if you believe that SHA1's
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
# enough guarantees about no collisions between objects ever hapenning.
|
|
#
|
|
# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
|
|
# Note that you need some new glibc (at least >2.2.4) for this, and it will
|
|
# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
|
|
# break unless your underlying filesystem supports those sub-second times
|
|
# (my ext3 doesn't).
|
|
CFLAGS=-g -O2 -Wall
|
|
|
|
CC=gcc
|
|
AR=ar
|
|
|
|
SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
|
|
git-pull-script git-tag-script git-resolve-script
|
|
|
|
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
|
|
git-read-tree git-commit-tree git-cat-file git-fsck-cache \
|
|
git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
|
|
git-check-files git-ls-tree git-merge-base git-merge-cache \
|
|
git-unpack-file git-export git-diff-cache git-convert-cache \
|
|
git-http-pull git-rpush git-rpull git-rev-list git-mktag \
|
|
git-diff-tree-helper git-tar-tree git-local-pull git-write-blob
|
|
|
|
all: $(PROG)
|
|
|
|
install: $(PROG) $(SCRIPTS)
|
|
install $(PROG) $(SCRIPTS) $(HOME)/bin/
|
|
|
|
LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
|
|
tag.o date.o
|
|
LIB_FILE=libgit.a
|
|
LIB_H=cache.h object.h blob.h tree.h commit.h tag.h
|
|
|
|
LIB_H += strbuf.h
|
|
LIB_OBJS += strbuf.o
|
|
|
|
LIB_H += diff.h
|
|
LIB_OBJS += diff.o
|
|
|
|
LIBS = $(LIB_FILE)
|
|
LIBS += -lz
|
|
|
|
ifdef MOZILLA_SHA1
|
|
SHA1_HEADER="mozilla-sha1/sha1.h"
|
|
LIB_OBJS += mozilla-sha1/sha1.o
|
|
else
|
|
ifdef PPC_SHA1
|
|
SHA1_HEADER="ppc/sha1.h"
|
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
|
else
|
|
SHA1_HEADER=<openssl/sha.h>
|
|
LIBS += -lssl
|
|
endif
|
|
endif
|
|
|
|
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
test-date: test-date.c date.o
|
|
$(CC) $(CFLAGS) -o $@ test-date.c date.o
|
|
|
|
git-%: %.c $(LIB_FILE)
|
|
$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
|
|
|
|
git-update-cache: update-cache.c
|
|
git-diff-files: diff-files.c
|
|
git-init-db: init-db.c
|
|
git-write-tree: write-tree.c
|
|
git-read-tree: read-tree.c
|
|
git-commit-tree: commit-tree.c
|
|
git-cat-file: cat-file.c
|
|
git-fsck-cache: fsck-cache.c
|
|
git-checkout-cache: checkout-cache.c
|
|
git-diff-tree: diff-tree.c
|
|
git-rev-tree: rev-tree.c
|
|
git-ls-files: ls-files.c
|
|
git-check-files: check-files.c
|
|
git-ls-tree: ls-tree.c
|
|
git-merge-base: merge-base.c
|
|
git-merge-cache: merge-cache.c
|
|
git-unpack-file: unpack-file.c
|
|
git-export: export.c
|
|
git-diff-cache: diff-cache.c
|
|
git-convert-cache: convert-cache.c
|
|
git-http-pull: http-pull.c pull.c
|
|
git-local-pull: local-pull.c pull.c
|
|
git-rpush: rsh.c
|
|
git-rpull: rsh.c pull.c
|
|
git-rev-list: rev-list.c
|
|
git-mktag: mktag.c
|
|
git-diff-tree-helper: diff-tree-helper.c
|
|
git-tar-tree: tar-tree.c
|
|
git-write-blob: write-blob.c
|
|
|
|
git-http-pull: LIBS += -lcurl
|
|
|
|
# Library objects..
|
|
blob.o: $(LIB_H)
|
|
tree.o: $(LIB_H)
|
|
commit.o: $(LIB_H)
|
|
tag.o: $(LIB_H)
|
|
object.o: $(LIB_H)
|
|
read-cache.o: $(LIB_H)
|
|
sha1_file.o: $(LIB_H)
|
|
usage.o: $(LIB_H)
|
|
diff.o: $(LIB_H)
|
|
strbuf.o: $(LIB_H)
|
|
|
|
clean:
|
|
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
|
|
|
|
backup: clean
|
|
cd .. ; tar czvf dircache.tar.gz dir-cache
|