Change $(X) -> $X to be less annoying.
H. Peter Anvin committed
Sep 30, 2005 at 10:46 UTC
2f29dd521832540450610893319561a5a136b3fb
1 file changed
+33
-33
Makefile
+33
-33
@@ -98,29 +98,29 @@ SCRIPT_PYTHON = \
98
99
# The ones that do not have to link with lcrypto nor lz.
100
SIMPLE_PROGRAMS = \
101
- git-get-tar-commit-id$(X) git-mailinfo$(X) git-mailsplit$(X) \
102
- git-stripspace$(X) git-var$(X) git-daemon$(X)
101
+ git-get-tar-commit-id$X git-mailinfo$X git-mailsplit$X \
102
+ git-stripspace$X git-var$X git-daemon$X
103
104
# ... and all the rest
105
PROGRAMS = \
106
- git-apply$(X) git-cat-file$(X) git-checkout-index$(X) \
107
- git-clone-pack$(X) git-commit-tree$(X) git-convert-objects$(X) \
108
- git-diff-files$(X) git-diff-index$(X) git-diff-stages$(X) \
109
- git-diff-tree$(X) git-fetch-pack$(X) git-fsck-objects$(X) \
110
- git-hash-object$(X) git-init-db$(X) git-local-fetch$(X) \
111
- git-ls-files$(X) git-ls-tree$(X) git-merge-base$(X) \
112
- git-merge-index$(X) git-mktag$(X) git-pack-objects$(X) \
113
- git-patch-id$(X) git-peek-remote$(X) git-prune-packed$(X) \
114
- git-read-tree$(X) git-receive-pack$(X) git-rev-list$(X) \
115
- git-rev-parse$(X) git-send-pack$(X) git-show-branch$(X) \
116
- git-show-index$(X) git-ssh-fetch$(X) git-ssh-upload$(X) \
117
- git-tar-tree$(X) git-unpack-file$(X) git-unpack-objects$(X) \
118
- git-update-index$(X) git-update-server-info$(X) \
119
- git-upload-pack$(X) git-verify-pack$(X) git-write-tree$(X) \
120
- git-update-ref$(X) $(SIMPLE_PROGRAMS)
106
+ git-apply$X git-cat-file$X git-checkout-index$X \
107
+ git-clone-pack$X git-commit-tree$X git-convert-objects$X \
108
+ git-diff-files$X git-diff-index$X git-diff-stages$X \
109
+ git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
110
+ git-hash-object$X git-init-db$X git-local-fetch$X \
111
+ git-ls-files$X git-ls-tree$X git-merge-base$X \
112
+ git-merge-index$X git-mktag$X git-pack-objects$X \
113
+ git-patch-id$X git-peek-remote$X git-prune-packed$X \
114
+ git-read-tree$X git-receive-pack$X git-rev-list$X \
115
+ git-rev-parse$X git-send-pack$X git-show-branch$X \
116
+ git-show-index$X git-ssh-fetch$X git-ssh-upload$X \
117
+ git-tar-tree$X git-unpack-file$X git-unpack-objects$X \
118
+ git-update-index$X git-update-server-info$X \
119
+ git-upload-pack$X git-verify-pack$X git-write-tree$X \
120
+ git-update-ref$X $(SIMPLE_PROGRAMS)
121
122
# Backward compatibility -- to be removed after 1.0
123
-PROGRAMS += git-ssh-pull$(X) git-ssh-push$(X)
123
+PROGRAMS += git-ssh-pull$X git-ssh-push$X
124
125
PYMODULES = \
126
gitMergeCommon.py
@@ -190,7 +190,7 @@ ifndef NO_CURL
190
else
191
CURL_LIBCURL = -lcurl
192
endif
193
- PROGRAMS += git-http-fetch$(X)
193
+ PROGRAMS += git-http-fetch$X
194
endif
195
196
ifndef SHELL_PATH
@@ -299,30 +299,30 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
299
%.o: %.S
300
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
301
302
-git-%$(X): %.o $(LIB_FILE)
302
+git-%$X: %.o $(LIB_FILE)
303
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
304
305
-git-mailinfo$(X) : SIMPLE_LIB += $(LIB_4_ICONV)
305
+git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV)
306
$(SIMPLE_PROGRAMS) : $(LIB_FILE)
307
-$(SIMPLE_PROGRAMS) : git-%$(X) : %.o
307
+$(SIMPLE_PROGRAMS) : git-%$X : %.o
308
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB)
309
310
-git-http-fetch$(X): fetch.o
311
-git-local-fetch$(X): fetch.o
312
-git-ssh-fetch$(X): rsh.o fetch.o
313
-git-ssh-upload$(X): rsh.o
314
-git-ssh-pull$(X): rsh.o fetch.o
315
-git-ssh-push$(X): rsh.o
310
+git-http-fetch$X: fetch.o
311
+git-local-fetch$X: fetch.o
312
+git-ssh-fetch$X: rsh.o fetch.o
313
+git-ssh-upload$X: rsh.o
314
+git-ssh-pull$X: rsh.o fetch.o
315
+git-ssh-push$X: rsh.o
316
317
-git-http-fetch$(X): LIBS += $(CURL_LIBCURL)
318
-git-rev-list$(X): LIBS += $(OPENSSL_LIBSSL)
317
+git-http-fetch$X: LIBS += $(CURL_LIBCURL)
318
+git-rev-list$X: LIBS += $(OPENSSL_LIBSSL)
319
320
init-db.o: init-db.c
321
$(CC) -c $(ALL_CFLAGS) \
322
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
323
324
$(LIB_OBJS): $(LIB_H)
325
-$(patsubst git-%$(X),%.o,$(PROGRAMS)): $(LIB_H)
325
+$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H)
326
$(DIFF_OBJS): diffcore.h
327
328
$(LIB_FILE): $(LIB_OBJS)
@@ -337,10 +337,10 @@ doc:
337
test: all
338
$(MAKE) -C t/ all
339
340
-test-date$(X): test-date.c date.o
340
+test-date$X: test-date.c date.o
341
$(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o
342
343
-test-delta$(X): test-delta.c diff-delta.o patch-delta.o
343
+test-delta$X: test-delta.c diff-delta.o patch-delta.o
344
$(CC) $(ALL_CFLAGS) -o $@ $^
345
346
check: