Skip to content

Commit 0846fe1

Browse files
committed
Merge branch 'fc/makefile'
Makefile simplification. * fc/makefile: Makefile: use $^ to avoid listing prerequisites on the command line build: do not install git-remote-testgit build: generate and clean test scripts
2 parents c0266ed + 21117bf commit 0846fe1

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ SCRIPT_PERL += git-svn.perl
491491
SCRIPT_PYTHON += git-remote-testpy.py
492492
SCRIPT_PYTHON += git-p4.py
493493

494+
NO_INSTALL += git-remote-testgit
494495
NO_INSTALL += git-remote-testpy
495496

496497
# Generated files for scripts
@@ -2067,13 +2068,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
20672068
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
20682069

20692070
$(LIB_FILE): $(LIB_OBJS)
2070-
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
2071+
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
20712072

20722073
$(XDIFF_LIB): $(XDIFF_OBJS)
2073-
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
2074+
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
20742075

20752076
$(VCSSVN_LIB): $(VCSSVN_OBJS)
2076-
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
2077+
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
20772078

20782079
export DEFAULT_EDITOR DEFAULT_PAGER
20792080

@@ -2233,6 +2234,7 @@ endif
22332234
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
22342235

22352236
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
2237+
all:: $(NO_INSTALL)
22362238

22372239
bin-wrappers/%: wrap-for-bin.sh
22382240
@mkdir -p bin-wrappers
@@ -2482,7 +2484,7 @@ clean: profile-clean coverage-clean
24822484
$(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
24832485
builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
24842486
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
2485-
$(RM) $(TEST_PROGRAMS)
2487+
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
24862488
$(RM) -r bin-wrappers $(dep_dirs)
24872489
$(RM) -r po/build/
24882490
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*

0 commit comments

Comments
 (0)