Just explicitly add $(X) to most programs.
H. Peter Anvin committed
Sep 28, 2005 at 23:31 UTC
bb8c91d617e8a2ab4a78712086d1574da6e24e68
1 file changed
+25
-30
Makefile
+25
-30
@@ -98,31 +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 git-mailinfo git-mailsplit git-stripspace \
102
- git-var git-daemon
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 git-cat-file \
107
- git-checkout-index git-clone-pack git-commit-tree \
108
- git-convert-objects git-diff-files \
109
- git-diff-index git-diff-stages \
110
- git-diff-tree git-fetch-pack git-fsck-objects \
111
- git-hash-object git-init-db \
112
- git-local-fetch git-ls-files git-ls-tree git-merge-base \
113
- git-merge-index git-mktag git-pack-objects git-patch-id \
114
- git-peek-remote git-prune-packed git-read-tree \
115
- git-receive-pack git-rev-list git-rev-parse \
116
- git-send-pack git-show-branch \
117
- git-show-index git-ssh-fetch \
118
- git-ssh-upload git-tar-tree git-unpack-file \
119
- git-unpack-objects git-update-index git-update-server-info \
120
- git-upload-pack git-verify-pack git-write-tree \
121
- git-update-ref \
122
- $(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 in 0.99.8
125
-PROGRAMS += git-ssh-pull git-ssh-push
123
+PROGRAMS += git-ssh-pull$(X) git-ssh-push$(X)
124
125
PYMODULES = \
126
gitMergeCommon.py
@@ -264,13 +262,10 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
262
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
263
gitk
264
267
-PROGRAMS_X = $(patsubst %,%$(X),$(PROGRAMS))
268
-SIMPLE_PROGRAMS_X = $(patsubst %,%$(X),$(SIMPLE_PROGRAMS))
269
-
265
export TAR INSTALL DESTDIR SHELL_PATH
266
### Build rules
267
273
-all: $(PROGRAMS_X) $(SCRIPTS)
268
+all: $(PROGRAMS) $(SCRIPTS)
269
270
all:
271
$(MAKE) -C templates
@@ -308,8 +303,8 @@ git-%$(X): %.o $(LIB_FILE)
303
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
304
305
git-mailinfo$(X) : SIMPLE_LIB += $(LIB_4_ICONV)
311
-$(SIMPLE_PROGRAMS_X) : $(LIB_FILE)
312
-$(SIMPLE_PROGRAMS_X) : git-%$(X) : %.o
306
+$(SIMPLE_PROGRAMS) : $(LIB_FILE)
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
@@ -327,7 +322,7 @@ init-db.o: init-db.c
322
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
323
324
$(LIB_OBJS): $(LIB_H)
330
-$(patsubst git-%$(X),%.o,$(PROGRAMS_X)): $(LIB_H)
325
+$(patsubst git-%$(X),%.o,$(PROGRAMS)): $(LIB_H)
326
$(DIFF_OBJS): diffcore.h
327
328
$(LIB_FILE): $(LIB_OBJS)
@@ -355,9 +350,9 @@ check:
350
351
### Installation rules
352
358
-install: $(PROGRAMS_X) $(SCRIPTS)
353
+install: $(PROGRAMS) $(SCRIPTS)
354
$(INSTALL) -d -m755 $(DESTDIR)$(bindir)
360
- $(INSTALL) $(PROGRAMS_X) $(SCRIPTS) $(DESTDIR)$(bindir)
355
+ $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
356
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
357
$(MAKE) -C templates install
358
$(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
@@ -395,7 +390,7 @@ deb: dist
390
### Cleaning rules
391
392
clean:
398
- rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS_X) $(LIB_FILE)
393
+ rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
394
rm -f $(filter-out gitk,$(SCRIPTS))
395
rm -f git-core.spec *.pyc *.pyo
396
rm -rf $(GIT_TARNAME)