X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=92f0bda5e785aaff667c82c6a07776197bd24e4e;hb=df8baa42fe4eeb5a021ac262caf601f44d2a5746;hp=f9ecbef6cbfa6a10d506e8551c7d23b525c205d4;hpb=5cfcd07c931e6029a77f9393309f7d0ec7cdc118;p=git.git diff --git a/Makefile b/Makefile index f9ecbef6..92f0bda5 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,9 @@ # 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 CURLDIR=/foo/bar if your curl header and library files are in +# /foo/bar/include and /foo/bar/lib directories. +# # Define NO_STRCASESTR if you don't have strcasestr. # # Define PPC_SHA1 environment variable when running make to make use of @@ -24,8 +27,6 @@ # 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 @@ -47,7 +48,7 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.7 +GIT_VERSION = 0.99.8 CFLAGS = -g -O2 -Wall ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) @@ -60,6 +61,7 @@ GIT_PYTHON_DIR = $(prefix)/share/git-core/python CC = gcc AR = ar +TAR = tar INSTALL = install RPMBUILD = rpmbuild @@ -87,7 +89,7 @@ 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-recursive.py @@ -114,11 +116,14 @@ PROGRAMS = \ 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 \ + git-update-ref git-symbolic-ref \ $(SIMPLE_PROGRAMS) -# Backward compatibility -- to be removed in 0.99.8 +# Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull git-ssh-push +GIT_LIST_TWEAK = + PYMODULES = \ gitMergeCommon.py @@ -128,10 +133,8 @@ endif ifdef WITH_SEND_EMAIL SCRIPT_PERL += git-send-email.perl -endif - -ifndef NO_CURL - PROGRAMS += git-http-fetch +else + GIT_LIST_TWEAK += -e '/^send-email$$/d' endif LIB_FILE=libgit.a @@ -156,6 +159,9 @@ LIB_OBJS = \ LIBS = $(LIB_FILE) LIBS += -lz +# +# Platform specific tweaks +# ifeq ($(shell uname -s),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease @@ -163,11 +169,31 @@ endif ifeq ($(shell uname -s),SunOS) NEEDS_SOCKET = YesPlease NEEDS_NSL = YesPlease + SHELL_PATH = /bin/bash + NO_STRCASESTR = YesPlease + CURLDIR = /opt/sfw + INSTALL = ginstall + TAR = gtar PLATFORM_DEFINES += -D__EXTENSIONS__ endif ifneq (,$(findstring arm,$(shell uname -m))) ARM_SHA1 = YesPlease endif +ifeq ($(shell uname -s),OpenBSD) + NEEDS_LIBICONV = YesPlease + PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib +endif + +ifndef NO_CURL + ifdef CURLDIR + # This is still problematic -- gcc does not want -R. + CFLAGS += -I$(CURLDIR)/include + CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl + else + CURL_LIBCURL = -lcurl + endif + PROGRAMS += git-http-fetch +endif ifndef SHELL_PATH SHELL_PATH = /bin/sh @@ -182,18 +208,32 @@ endif ifndef NO_OPENSSL LIB_OBJS += epoch.o OPENSSL_LIBSSL = -lssl + ifdef OPENSSLDIR + # Again this may be problematic -- gcc does not always want -R. + CFLAGS += -I$(OPENSSLDIR)/include + OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib + else + OPENSSL_LINK = + endif else DEFINES += '-DNO_OPENSSL' MOZILLA_SHA1 = 1 OPENSSL_LIBSSL = endif ifdef NEEDS_SSL_WITH_CRYPTO - LIB_4_CRYPTO = -lcrypto -lssl + LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl else - LIB_4_CRYPTO = -lcrypto + LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto endif ifdef NEEDS_LIBICONV - LIB_4_ICONV = -liconv + ifdef ICONVDIR + # Again this may be problematic -- gcc does not always want -R. + CFLAGS += -I$(ICONVDIR)/include + ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib + else + ICONV_LINK = + endif + LIB_4_ICONV = $(ICONV_LINK) -liconv else LIB_4_ICONV = endif @@ -235,6 +275,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ gitk +export TAR INSTALL DESTDIR SHELL_PATH ### Build rules all: $(PROGRAMS) $(SCRIPTS) @@ -244,7 +285,9 @@ all: git: git.sh Makefile rm -f $@+ $@ - sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' <$@.sh >$@+ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + $(GIT_LIST_TWEAK) <$@.sh >$@+ chmod +x $@+ mv $@+ $@ @@ -285,7 +328,7 @@ git-ssh-upload: rsh.o git-ssh-pull: rsh.o fetch.o git-ssh-push: rsh.o -git-http-fetch: LIBS += -lcurl +git-http-fetch: LIBS += $(CURL_LIBCURL) git-rev-list: LIBS += $(OPENSSL_LIBSSL) init-db.o: init-db.c @@ -346,7 +389,7 @@ 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 + $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar @@ -355,20 +398,20 @@ rpm: dist deb: dist rm -rf $(GIT_TARNAME) - tar zxf $(GIT_TARNAME).tar.gz + $(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 $(PROGRAMS) $(LIB_FILE) + rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE) rm -f $(filter-out gitk,$(SCRIPTS)) - rm -f git-core.spec + rm -f git-core.spec *.pyc *.pyo 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 Documentation/ clean - $(MAKE) -C templates/ clean + $(MAKE) -C templates clean $(MAKE) -C t/ clean