Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
Some platforms (Solaris in particular) appear to require -lz as part of the link line for git-daemon, due to it linking against sha1_file.o and that module requiring inflate/deflate support. So its time to retire SIMPLE_PROGRAMS and move its last remaining member into the standard PROGRAMS list, allowing it to link against all libraries used by the rest of Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
Nov 5, 2006 at 02:28 UTC
af8ffbed0fc016e066765706738c45c65493f392
1 file changed
+2
-12
Makefile
+2
-12
@@ -185,15 +185,12 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
185
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
186
git-cherry-pick git-status git-instaweb
187
188
-# The ones that do not have to link with lcrypto, lz nor xdiff.
189
-SIMPLE_PROGRAMS = \
190
- git-daemon$X
191
-
188
# ... and all the rest that could be moved out of bindir to gitexecdir
189
PROGRAMS = \
190
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
191
git-hash-object$X git-index-pack$X git-local-fetch$X \
192
git-merge-base$X \
193
+ git-daemon$X \
194
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
195
git-peek-remote$X git-receive-pack$X \
196
git-send-pack$X git-shell$X \
@@ -215,7 +212,7 @@ BUILT_INS = \
212
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
213
214
# what 'all' will build and 'install' will install, in gitexecdir
218
-ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \
215
+ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
216
git-merge-recur$X
217
218
# Backward compatibility -- to be removed after 1.0
@@ -479,11 +476,9 @@ ifdef NEEDS_LIBICONV
476
endif
477
ifdef NEEDS_SOCKET
478
EXTLIBS += -lsocket
482
- SIMPLE_LIB += -lsocket
479
endif
480
ifdef NEEDS_NSL
481
EXTLIBS += -lnsl
486
- SIMPLE_LIB += -lnsl
482
endif
483
ifdef NO_D_TYPE_IN_DIRENT
484
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
@@ -728,11 +723,6 @@ endif
723
git-%$X: %.o $(GITLIBS)
724
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
725
731
-$(SIMPLE_PROGRAMS) : $(LIB_FILE)
732
-$(SIMPLE_PROGRAMS) : git-%$X : %.o
733
- $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
734
- $(LIB_FILE) $(SIMPLE_LIB)
735
-
726
ssh-pull.o: ssh-fetch.c
727
ssh-push.o: ssh-upload.c
728
git-local-fetch$X: fetch.o