projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
c0463c6
..
16ab0c7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,6
+6,9
@@
# 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.
#
# 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.
#
+# Define NO_CURL if you do not have curl installed. git-http-pull is not
+# built, and you cannot use http:// and https:// transports.
+#
# Define PPC_SHA1 environment variable when running make to make use of
# a bundled SHA1 routine optimized for PowerPC.
# Define PPC_SHA1 environment variable when running make to make use of
# a bundled SHA1 routine optimized for PowerPC.
@@
-29,23
+32,24
@@
# DEFINES += -DUSE_STDEV
# DEFINES += -DUSE_STDEV
-GIT_VERSION
=0.99.2
+GIT_VERSION
= 0.99.4
-C
OPTS?=-g -O2
-
CFLAGS+=$(COPTS) -Wall
$(DEFINES)
+C
FLAGS = -g -O2 -Wall
+
ALL_CFLAGS = $(CFLAGS)
$(DEFINES)
-prefix=$(HOME)
-bindir=$(prefix)/bin
-# dest=
+prefix = $(HOME)
+bindir = $(prefix)/bin
+template_dir = $(prefix)/share/git-core/templates/
+# DESTDIR=
-CC
?=
gcc
-AR
?=
ar
-INSTALL
?=
install
-RPMBUILD
?=
rpmbuild
+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 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__
+SPARSE_FLAGS
=
-D__BIG_ENDIAN__ -D__powerpc__
@@
-62,14
+66,19
@@
SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-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-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
+ git-request-pull-script git-bisect-script
+
+SCRIPTS += git-count-objects-script
+# SCRIPTS += git-send-email-script
+SCRIPTS += git-revert-script
+SCRIPTS += git-show-branches-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 \
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-ls-tree git-merge-base git-merge-cache \
git-unpack-file git-export git-diff-cache git-convert-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-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-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 \
@@
-78,16
+87,24
@@
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-show-index git-daemon git-var git-peek-remote \
git-update-server-info git-show-rev-cache git-build-rev-cache
git-show-index git-daemon git-var git-peek-remote \
git-update-server-info git-show-rev-cache git-build-rev-cache
+ifndef NO_CURL
+ PROG+= git-http-pull
+endif
+
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 \
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
+ refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
+ sha1_name.o
LIB_H += rev-cache.h
LIB_OBJS += rev-cache.o
LIB_H += rev-cache.h
LIB_OBJS += rev-cache.o
+LIB_H += run-command.h
+LIB_OBJS += run-command.o
+
LIB_H += strbuf.h
LIB_OBJS += strbuf.o
LIB_H += strbuf.h
LIB_OBJS += strbuf.o
@@
-107,28
+124,30
@@
LIBS += -lz
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
+ OPENSSL_LIBSSL=-lssl
else
else
-
CFLAG
S += '-DNO_OPENSSL'
+
DEFINE
S += '-DNO_OPENSSL'
MOZILLA_SHA1=1
MOZILLA_SHA1=1
+ OPENSSL_LIBSSL=
endif
ifdef MOZILLA_SHA1
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
+ SHA1_HEADER="mozilla-sha1/sha1.h"
+ LIB_OBJS += mozilla-sha1/sha1.o
else
else
- SHA1_HEADER=<openssl/sha.h>
-ifeq ($(shell uname -s),Darwin)
- LIBS += -lcrypto -lssl
-else
- LIBS += -lcrypto
-endif
-endif
+ 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
endif
-
CFLAG
S += '-DSHA1_HEADER=$(SHA1_HEADER)'
+
DEFINE
S += '-DSHA1_HEADER=$(SHA1_HEADER)'
@@
-136,10
+155,17
@@
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
all: $(PROG)
all: $(PROG)
+all:
+ $(MAKE) -C templates
+ $(MAKE) -C tools
+
+%.o: %.c
+ $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+%.o: %.S
+ $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-.PRECIOUS: %.o
git-%: %.o $(LIB_FILE)
git-%: %.o $(LIB_FILE)
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(
ALL_
CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
git-http-pull: pull.o
git-local-pull: pull.o
git-http-pull: pull.o
git-local-pull: pull.o
@@
-147,9
+173,14
@@
git-ssh-pull: rsh.o pull.o
git-ssh-push: rsh.o
git-http-pull: LIBS += -lcurl
git-ssh-push: rsh.o
git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
+
+init-db.o: init-db.c
+ $(CC) -c $(ALL_CFLAGS) \
+ -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
$(LIB_OBJS): $(LIB_H)
$(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
@@
-166,23
+197,22
@@
test: all
$(MAKE) -C t/ all
test-date: test-date.c date.o
$(MAKE) -C t/ all
test-date: test-date.c date.o
- $(CC) $(CFLAGS) -o $@ test-date.c date.o
+ $(CC) $(
ALL_
CFLAGS) -o $@ test-date.c date.o
test-delta: test-delta.c diff-delta.o patch-delta.o
test-delta: test-delta.c diff-delta.o patch-delta.o
- $(CC) $(CFLAGS) -o $@ $^
+ $(CC) $(
ALL_
CFLAGS) -o $@ $^
check:
check:
- for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
+ for i in *.c; do sparse $(
ALL_
CFLAGS) $(SPARSE_FLAGS) $$i; done
### Installation rules
install: $(PROG) $(SCRIPTS)
### Installation rules
install: $(PROG) $(SCRIPTS)
- $(INSTALL) -m755 -d $(dest)$(bindir)
- $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
-
-install-tools:
+ $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+ $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+ $(MAKE) -C templates install
$(MAKE) -C tools install
install-doc:
$(MAKE) -C tools install
install-doc:
@@
-208,16
+238,22
@@
dist: git-core.spec git-tar-tree
rpm: dist
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
rpm: dist
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
-
-backup: clean
- cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
+deb: dist
+ rm -rf $(GIT_TARNAME)
+ tar zxf $(GIT_TARNAME).tar.gz
+ dpkg-source -b $(GIT_TARNAME)
+ cd $(GIT_TARNAME) && fakeroot debian/rules binary
### Cleaning rules
clean:
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
### Cleaning rules
clean:
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
- rm -f git-core-*.tar.gz git-core.spec
+ rm -f git-core.spec
+ rm -rf $(GIT_TARNAME)
+ rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
+ rm -f git-core_$(GIT_VERSION)-*.deb git-core_$(GIT_VERSION)-*.dsc
+ rm -f git-tk_$(GIT_VERSION)-*.deb
$(MAKE) -C tools/ clean
$(MAKE) -C Documentation/ clean
$(MAKE) -C tools/ clean
$(MAKE) -C Documentation/ clean
+ $(MAKE) -C templates/ clean
+ $(MAKE) -C t/ clean