X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=e90f646af0a26449386b0b442bc8df844eca9820;hb=cfd8aefd4babcca5adbb724fb213ea3c8b1153c8;hp=18696fa7bc213e667f80052e0484f9a4e1879e7e;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/Makefile b/Makefile index 18696fa7..e90f646a 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,22 @@ # 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 NO_STRCASESTR if you don't have strcasestr. +# # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). +# # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). - +# +# Define NEEDS_SOCKET if linking with libc is not enough (SunOS, +# Patrick Mauritz). +# +# Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz). +# +# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3. +# # 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. @@ -34,14 +44,15 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.6 +GIT_VERSION = 0.99.7c CFLAGS = -g -O2 -Wall -ALL_CFLAGS = $(CFLAGS) $(DEFINES) +ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) prefix = $(HOME) bindir = $(prefix)/bin template_dir = $(prefix)/share/git-core/templates/ +GIT_PYTHON_DIR = $(prefix)/share/git-core/python # DESTDIR= CC = gcc @@ -67,11 +78,16 @@ SCRIPT_SH = \ git-repack.sh git-request-pull.sh git-reset.sh \ git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \ git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \ - git-applymbox.sh git-applypatch.sh + git-applymbox.sh git-applypatch.sh \ + git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ + git-merge-resolve.sh git-grep.sh SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-rename.perl git-send-email.perl git-shortlog.perl + git-rename.perl git-shortlog.perl + +SCRIPT_PYTHON = \ + git-merge-recursive.py # The ones that do not have to link with lcrypto nor lz. SIMPLE_PROGRAMS = \ @@ -80,7 +96,7 @@ SIMPLE_PROGRAMS = \ # ... and all the rest PROGRAMS = \ - git-apply git-build-rev-cache git-cat-file \ + git-apply git-cat-file \ git-checkout-index git-clone-pack git-commit-tree \ git-convert-objects git-diff-files \ git-diff-helper git-diff-index git-diff-stages \ @@ -91,12 +107,22 @@ PROGRAMS = \ git-peek-remote git-prune-packed git-read-tree \ git-receive-pack git-rev-list git-rev-parse \ git-rev-tree git-send-pack git-show-branch \ - git-show-index git-show-rev-cache git-ssh-fetch \ + git-show-index git-ssh-fetch \ git-ssh-upload git-tar-tree git-unpack-file \ git-unpack-objects git-update-index git-update-server-info \ git-upload-pack git-verify-pack git-write-tree \ $(SIMPLE_PROGRAMS) +# Backward compatibility -- to be removed in 0.99.8 +PROGRAMS += git-ssh-pull git-ssh-push + +PYMODULES = \ + gitMergeCommon.py + +ifdef WITH_OWN_SUBPROCESS_PY + PYMODULES += compat/subprocess.py +endif + ifdef WITH_SEND_EMAIL SCRIPT_PERL += git-send-email.perl endif @@ -110,7 +136,7 @@ LIB_FILE=libgit.a LIB_H = \ blob.h cache.h commit.h count-delta.h csum-file.h delta.h \ diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \ - rev-cache.h run-command.h strbuf.h tag.h tree.h + run-command.h strbuf.h tag.h tree.h DIFF_OBJS = \ diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \ @@ -118,9 +144,9 @@ DIFF_OBJS = \ LIB_OBJS = \ blob.o commit.o connect.o count-delta.o csum-file.o \ - date.o diff-delta.o entry.o gitenv.o ident.o index.o \ + date.o diff-delta.o entry.o ident.o index.o \ object.o pack-check.o patch-delta.o path.o pkt-line.o \ - quote.o read-cache.o refs.o rev-cache.o run-command.o \ + quote.o read-cache.o refs.o run-command.o \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ tag.o tree.o usage.o $(DIFF_OBJS) @@ -131,6 +157,21 @@ ifeq ($(shell uname -s),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease endif +ifeq ($(shell uname -s),SunOS) + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease + PLATFORM_DEFINES += -D__EXTENSIONS__ +endif + +ifndef SHELL_PATH + SHELL_PATH = /bin/sh +endif +ifndef PERL_PATH + PERL_PATH = /usr/bin/perl +endif +ifndef PYTHON_PATH + PYTHON_PATH = /usr/bin/python +endif ifndef NO_OPENSSL LIB_OBJS += epoch.o @@ -162,18 +203,56 @@ else LIBS += $(LIB_4_CRYPTO) endif endif +ifdef NEEDS_SOCKET + LIBS += -lsocket + SIMPLE_LIB += -lsocket +endif +ifdef NEEDS_NSL + LIBS += -lnsl + SIMPLE_LIB += -lnsl +endif +ifdef NO_STRCASESTR + DEFINES += -Dstrcasestr=gitstrcasestr + LIB_OBJS += compat/strcasestr.o +endif DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)' -SCRIPTS = $(SCRIPT_SH) $(SCRIPT_PERL) gitk +SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ + $(patsubst %.perl,%,$(SCRIPT_PERL)) \ + $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ + gitk ### Build rules -all: $(PROGRAMS) +all: $(PROGRAMS) $(SCRIPTS) all: $(MAKE) -C templates +git: git.sh Makefile + rm -f $@+ $@ + sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' <$@.sh >$@+ + chmod +x $@+ + mv $@+ $@ + +$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh + rm -f $@ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' $@.sh >$@ + chmod +x $@ + +$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl + rm -f $@ + sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@ + chmod +x $@ + +$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py + rm -f $@ + sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \ + -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \ + $@.py >$@ + chmod +x $@ + %.o: %.c $(CC) -o $*.o -c $(ALL_CFLAGS) $< %.o: %.S @@ -191,6 +270,8 @@ git-http-fetch: fetch.o git-local-fetch: fetch.o git-ssh-fetch: rsh.o fetch.o git-ssh-upload: rsh.o +git-ssh-pull: rsh.o fetch.o +git-ssh-push: rsh.o git-http-fetch: LIBS += -lcurl git-rev-list: LIBS += $(OPENSSL_LIBSSL) @@ -229,22 +310,13 @@ check: ### Installation rules install: $(PROGRAMS) $(SCRIPTS) - $(INSTALL) -m755 -d $(DESTDIR)$(bindir) - $(INSTALL) $(PROGRAMS) $(DESTDIR)$(bindir) - @for s in $(SCRIPTS); \ - do \ - case "$$s" in \ - *.*) \ - e=`expr "$$s" : '\(.*\)\.[^.]*$$'` ;; \ - *) \ - e="$$s" ;; \ - esac && \ - echo ": install $$s $(DESTDIR)$(bindir)/$$e" && \ - $(INSTALL) $$s $(DESTDIR)$(bindir)/$$e || exit; \ - done - $(INSTALL) git-revert.sh $(DESTDIR)$(bindir)/git-cherry-pick + $(INSTALL) -d -m755 $(DESTDIR)$(bindir) + $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick sh ./cmd-rename.sh $(DESTDIR)$(bindir) $(MAKE) -C templates install + $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR) + $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR) install-doc: $(MAKE) -C Documentation install @@ -279,6 +351,7 @@ deb: dist clean: rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROGRAMS) $(LIB_FILE) + rm -f $(filter-out gitk,$(SCRIPTS)) rm -f git-core.spec rm -rf $(GIT_TARNAME) rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz