X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=8f2497cd997257db25953672f809eb81daa00eaf;hb=dd53c7ab297cc491eb5164198e63d670c7b48530;hp=b04c0d8a9c28c6b1108bcf866d0210b99025175a;hpb=ff5ebe39b0ca5cbdcbe11f092b5b43dbeada820e;p=git.git

diff --git a/Makefile b/Makefile
index b04c0d8a..d7d4182e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,77 +1,222 @@
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
+# Define MOZILLA_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
+# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
+# choice) has very fast version optimized for i586.
+#
+# Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
+# miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
 #
-# -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 -O3 -Wall
+# Define PPC_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine optimized for PowerPC.
+
+
+# Define COLLISION_CHECK below if you believe that SHA1's
+# 1461501637330902918203684832716283019655932542976 hashes do not give you
+# sufficient guarantee that no collisions between objects will ever happen.
+
+# DEFINES += -DCOLLISION_CHECK
+
+# Define USE_NSEC below if you want git to care about sub-second file mtimes
+# and ctimes. Note that you need recent 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).
+
+# DEFINES += -DUSE_NSEC
+
+# Define USE_STDEV below if you want git to care about the underlying device
+# change being considered an inode change from the update-cache perspective.
+
+# DEFINES += -DUSE_STDEV
+
+GIT_VERSION=0.99.2
+
+COPTS?=-g -O2
+CFLAGS+=$(COPTS) -Wall $(DEFINES)
+
+prefix=$(HOME)
+bindir=$(prefix)/bin
+# dest=
+
+CC?=gcc
+AR?=ar
+INSTALL?=install
+RPMBUILD?=rpmbuild
+
+# sparse is architecture-neutral, which means that we need to tell it
+# explicitly what architecture to check for. Fix this up for yours..
+SPARSE_FLAGS?=-D__BIG_ENDIAN__ -D__powerpc__
+
+
+
+### --- END CONFIGURATION SECTION ---
+
+
+
+SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
+	git-pull-script git-tag-script git-resolve-script git-whatchanged \
+	git-fetch-script git-status-script git-commit-script \
+	git-log-script git-shortlog git-cvsimport-script git-diff-script \
+	git-reset-script git-add-script git-checkout-script git-clone-script \
+	gitk git-cherry git-rebase-script git-relink-script git-repack-script \
+	git-format-patch-script git-sh-setup-script git-push-script \
+	git-branch-script git-parse-remote git-verify-tag-script \
+	git-ls-remote-script git-clone-dumb-http git-rename-script \
+	git-request-pull-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-ssh-push git-ssh-pull git-rev-list git-mktag \
+	git-diff-helper git-tar-tree git-local-pull git-hash-object \
+	git-get-tar-commit-id git-apply git-stripspace \
+	git-diff-stages git-rev-parse git-patch-id git-pack-objects \
+	git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
+	git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
+	git-show-index git-daemon git-var git-peek-remote \
+	git-update-server-info git-show-rev-cache git-build-rev-cache
+
+LIB_FILE=libgit.a
+LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
+	pack.h pkt-line.h refs.h
+LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
+	 tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
+	 refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o
+
+LIB_H += rev-cache.h
+LIB_OBJS += rev-cache.o
 
-CC=gcc
+LIB_H += strbuf.h
+LIB_OBJS += strbuf.o
 
+LIB_H += quote.h
+LIB_OBJS += quote.o 
 
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
+LIB_H += diff.h count-delta.h
+DIFF_OBJS = diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
+	diffcore-break.o diffcore-order.o
+LIB_OBJS += $(DIFF_OBJS) count-delta.o
+
+LIB_OBJS += gitenv.o
+LIB_OBJS += server-info.o
+
+LIBS = $(LIB_FILE)
+LIBS += -lz
+
+ifndef NO_OPENSSL
+	LIB_OBJS += epoch.o
+else
+	CFLAGS += '-DNO_OPENSSL'
+	MOZILLA_SHA1=1
+endif
+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>
+ifeq ($(shell uname -s),Darwin)
+  LIBS += -lcrypto -lssl
+else
+  LIBS += -lcrypto
+endif
+endif
+endif
+
+CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
+
+
+
+### Build rules
 
 all: $(PROG)
 
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
 
-LIBS= -lssl -lz
+git-%: %.c $(LIB_FILE)
+	$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
 
-init-db: init-db.o
+git-http-pull: pull.c
+git-local-pull: pull.c
+git-ssh-pull: rsh.c pull.c
+git-ssh-push: rsh.c
 
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
+git-http-pull: LIBS += -lcurl
+git-rev-list: LIBS += -lssl
 
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
+$(LIB_OBJS): $(LIB_H)
+$(DIFF_OBJS): diffcore.h
 
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
+$(LIB_FILE): $(LIB_OBJS)
+	$(AR) rcs $@ $(LIB_OBJS)
 
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
+doc:
+	$(MAKE) -C Documentation all
 
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
+### Testing rules
 
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
+test: all
+	$(MAKE) -C t/ all
 
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
+test-date: test-date.c date.o
+	$(CC) $(CFLAGS) -o $@ test-date.c date.o
 
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
+test-delta: test-delta.c diff-delta.o patch-delta.o
+	$(CC) $(CFLAGS) -o $@ $^
 
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
+check:
+	for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
 
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 
-merge-base: merge-base.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
+### Installation rules
 
-read-cache.o: cache.h
-show-diff.o: cache.h
+install: $(PROG) $(SCRIPTS)
+	$(INSTALL) -m755 -d $(dest)$(bindir)
+	$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
+
+install-tools:
+	$(MAKE) -C tools install
+
+install-doc:
+	$(MAKE) -C Documentation install
+
+
+
+
+### Maintainer's dist rules
+
+git-core.spec: git-core.spec.in Makefile
+	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
+
+GIT_TARNAME=git-core-$(GIT_VERSION)
+dist: git-core.spec git-tar-tree
+	./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
+	@mkdir -p $(GIT_TARNAME)
+	@cp git-core.spec $(GIT_TARNAME)
+	tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
+	@rm -rf $(GIT_TARNAME)
+	gzip -f -9 $(GIT_TARNAME).tar
+
+rpm: dist
+	$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
-clean:
-	rm -f *.o $(PROG)
 
 backup: clean
 	cd .. ; tar czvf dircache.tar.gz dir-cache
+
+
+
+### Cleaning rules
+
+clean:
+	rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
+	rm -f git-core-*.tar.gz git-core.spec
+	$(MAKE) -C tools/ clean
+	$(MAKE) -C Documentation/ clean