[PATCH] Rename daemon.c's lognotice() to loginfo()

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index e2bbcb5..8a1a06f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,14 @@
 # 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 ARM_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine optimized for ARM.
+#
 # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
@@ -21,6 +26,8 @@
 #
 # 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.
@@ -80,10 +87,10 @@ SCRIPT_SH = \
 
 SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
-       git-rename.perl git-shortlog.perl
+       git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl
 
 SCRIPT_PYTHON = \
-       git-merge-fredrik.py
+       git-merge-recursive.py
 
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \
@@ -92,26 +99,33 @@ 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 \
-       git-diff-tree git-export git-fetch-pack git-fsck-objects \
+       git-diff-index git-diff-stages \
+       git-diff-tree git-fetch-pack git-fsck-objects \
        git-hash-object git-init-db \
        git-local-fetch git-ls-files git-ls-tree git-merge-base \
        git-merge-index git-mktag git-pack-objects git-patch-id \
        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-send-pack git-show-branch \
+       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
@@ -125,7 +139,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 \
@@ -135,7 +149,7 @@ LIB_OBJS = \
        blob.o commit.o connect.o count-delta.o csum-file.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)
 
@@ -148,7 +162,11 @@ ifeq ($(shell uname -s),Darwin)
 endif
 ifeq ($(shell uname -s),SunOS)
        NEEDS_SOCKET = YesPlease
-       PLATFORM_DEFINES += -DNO_GETDOMAINNAME=1
+       NEEDS_NSL = YesPlease
+       PLATFORM_DEFINES += -D__EXTENSIONS__
+endif
+ifneq (,$(findstring arm,$(shell uname -m)))
+       ARM_SHA1 = YesPlease
 endif
 
 ifndef SHELL_PATH
@@ -179,21 +197,35 @@ ifdef NEEDS_LIBICONV
 else
        LIB_4_ICONV =
 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
+
+ifdef PPC_SHA1
+       SHA1_HEADER = "ppc/sha1.h"
+       LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+else
+ifdef ARM_SHA1
+       SHA1_HEADER = "arm/sha1.h"
+       LIB_OBJS += arm/sha1.o arm/sha1_arm.o
+else
 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 += $(LIB_4_CRYPTO)
-       endif
+       SHA1_HEADER = <openssl/sha.h>
+       LIBS += $(LIB_4_CRYPTO)
+endif
 endif
-ifdef NEEDS_SOCKET
-       LIBS += -lsocket
-       SIMPLE_LIB += -lsocket
 endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
@@ -250,6 +282,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)
@@ -288,12 +322,12 @@ check:
 ### Installation rules
 
 install: $(PROGRAMS) $(SCRIPTS)
-       $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+       $(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) -m755 -d $(DESTDIR)$(GIT_PYTHON_DIR)
+       $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
        $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
 
 install-doc: