From: Felipe Contreras Date: Sun, 09 Jun 2013 16:40:16 GMT Subject: [PATCH v4 04/45] build: add builtin lib Message-ID: <1370796057-25312-5-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1370796057-25312-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b6cd5a..d2af207 100644 --- a/Makefile +++ b/Makefile @@ -631,6 +631,7 @@ export PERL_PATH export PYTHON_PATH LIB_FILE = libgit.a +BUILTIN_LIB = builtin/lib.a XDIFF_LIB = xdiff/lib.a VCSSVN_LIB = vcs-svn/lib.a @@ -1713,9 +1714,9 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \ '-DGIT_INFO_PATH="$(infodir_relative_SQ)"' -git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) +git$X: git.o GIT-LDFLAGS $(BUILTIN_LIB) $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ - $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) + $(ALL_LDFLAGS) $(BUILTIN_LIB) $(LIBS) help.sp help.s help.o: common-cmds.h @@ -2070,6 +2071,9 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ +$(BUILTIN_LIB): $(BUILTIN_OBJS) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ + $(XDIFF_LIB): $(XDIFF_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ @@ -2482,7 +2486,7 @@ profile-clean: clean: profile-clean coverage-clean $(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \ - builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) + builtin/*.o $(LIB_FILE) $(BUILTIN_LIB) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(NO_INSTALL) $(RM) -r bin-wrappers $(dep_dirs) -- 1.8.3.698.g079b096