[PATCH] Also parse objects we already have

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index ecc2277..e8441af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,8 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-request-pull-script git-bisect-script
 
 SCRIPTS += git-count-objects-script
-SCRIPTS += git-send-email-script
+# SCRIPTS += git-send-email-script
+SCRIPTS += git-revert-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 \
@@ -174,6 +175,7 @@ init-db.o: init-db.c
        $(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
 
 $(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -234,16 +236,17 @@ rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
 deb: dist
-       rm -rf git-core-$(GIT_VERSION)
-       tar zxf git-core-$(GIT_VERSION).tar.gz
-       cd git-core-$(GIT_VERSION) && fakeroot debian/rules binary
+       rm -rf $(GIT_TARNAME)
+       tar zxf $(GIT_TARNAME).tar.gz
+       cd $(GIT_TARNAME) && fakeroot debian/rules binary
 
 ### Cleaning rules
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       rm -f git-core-*.tar.gz git-core.spec git-core-$(GIT_VERSION)-*.deb
-       rm -rf git-core-$(GIT_VERSION)
+       rm -f $(GIT_TARNAME).tar.gz git-core.spec
+       rm -f git-core_$(GIT_VERSION)-*.deb git-tk_$(GIT_VERSION)-*.deb
+       rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean