On Tue, 11 Jul 2006, Junio C Hamano wrote:
>
> You seem to have forgotten one file (fetch-pack.c) but that was
> trivial. I'll apply and push it out shortly.
Actually, it was fetch.c, not fetch-pack.c, and I forgot that due to a
very real (and totally separate) bug.
The makefile doesn't have any dependencies for "fetch.o" and "rsh.o", so
when you change the headers, they never get rebuilt.
I think fetch.o and rsh.o should either get added to the library files, or
we need something like this..
(I didn't check that I caught all the appropriate *.o files, but this
should be better than what we have now).
Even better would be to make the dependancies automatic. The kernel does
that really well with some GNU Makefile magic, but it also depends on
magic gcc command line flags ("-Wp,-MD,$(depfile)")
Linus
---
diff --git a/Makefile b/Makefile
index e75fb13..854e0af 100644
--- a/Makefile
+++ b/Makefile
@@ -236,6 +236,9 @@ BUILTIN_OBJS = \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o
+MISC_OBJS = \
+ fetch.o rsh.o http-fetch.o http-push.o
+
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
LIBS = $(GITLIBS) -lz
@@ -615,7 +618,7 @@ git-http-push$X: revision.o http.o http-
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
-$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
+$(LIB_OBJS) $(BUILTIN_OBJS) $(MISC_OBJS): $(LIB_H)
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
$(DIFF_OBJS): diffcore.h
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html