NO_OPENSSL should really mean no openssl.

diff --git a/Makefile b/Makefile
index 916a8818879018c01e310f034377dfc3e7d5d84c..7b97be65f9feb82f39bfab0860daec080e7e14a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,16 @@ 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 \
@@ -74,18 +78,12 @@ 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
 
-all: $(PROG)
-
-install: $(PROG) $(SCRIPTS)
-       $(INSTALL) -m755 -d $(dest)$(bindir)
-       $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
-
-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 \
-        epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.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
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
@@ -107,6 +105,14 @@ LIB_OBJS += server-info.o
 LIBS = $(LIB_FILE)
 LIBS += -lz
 
+ifndef NO_OPENSSL
+       LIB_OBJS += epoch.o
+       OPENSSL_LIBSSL=-lssl
+else
+       CFLAGS += '-DNO_OPENSSL'
+       MOZILLA_SHA1=1
+       OPENSSL_LIBSSL=
+endif
 ifdef MOZILLA_SHA1
   SHA1_HEADER="mozilla-sha1/sha1.h"
   LIB_OBJS += mozilla-sha1/sha1.o
@@ -126,11 +132,40 @@ endif
 
 CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
+
+
+### Build rules
+
+all: $(PROG)
+
+
+.PRECIOUS: %.o
+git-%: %.o $(LIB_FILE)
+       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+
+git-http-pull: pull.o
+git-local-pull: pull.o
+git-ssh-pull: rsh.o pull.o
+git-ssh-push: rsh.o
+
+git-http-pull: LIBS += -lcurl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
+
+$(LIB_OBJS): $(LIB_H)
+$(DIFF_OBJS): diffcore.h
+
 $(LIB_FILE): $(LIB_OBJS)
        $(AR) rcs $@ $(LIB_OBJS)
 
-check:
-       for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
+doc:
+       $(MAKE) -C Documentation all
+
+
+
+### Testing rules
+
+test: all
+       $(MAKE) -C t/ all
 
 test-date: test-date.c date.o
        $(CC) $(CFLAGS) -o $@ test-date.c date.o
@@ -138,19 +173,27 @@ test-date: test-date.c date.o
 test-delta: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(CFLAGS) -o $@ $^
 
-git-%: %.c $(LIB_FILE)
-       $(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
+check:
+       for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
 
-git-http-pull: pull.c
-git-local-pull: pull.c
-git-ssh-pull: rsh.c pull.c
-git-ssh-push: rsh.c
 
-git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
 
-$(LIB_OBJS): $(LIB_H)
-$(DIFF_OBJS): diffcore.h
+### Installation rules
+
+install: $(PROG) $(SCRIPTS)
+       $(INSTALL) -m755 -d $(dest)$(bindir)
+       $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+
+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' < $< > $@
@@ -167,23 +210,16 @@ dist: git-core.spec git-tar-tree
 rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
-test: all
-       $(MAKE) -C t/ all
 
-doc:
-       $(MAKE) -C Documentation all
+backup: clean
+       cd .. ; tar czvf dircache.tar.gz dir-cache
 
-install-tools:
-       $(MAKE) -C tools install
 
-install-doc:
-       $(MAKE) -C Documentation install
+
+### 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
-
-backup: clean
-       cd .. ; tar czvf dircache.tar.gz dir-cache