diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:28 -0800 |
| commit | ac93bfc3b64a8a3756263ecdadad3e7a117be597 (patch) | |
| tree | 83ee665768a654e556684fcf1d8a25b09819aaec /Makefile | |
| parent | d93067d9c7fb210766c7282d662289f54d53f93a (diff) | |
| parent | 3467fec516e0549cfe7ae3ed8bd981a7e5f528f4 (diff) | |
| download | git-ac93bfc3b64a8a3756263ecdadad3e7a117be597.tar.gz | |
Merge branch 'lt/diffgen' into next
* lt/diffgen:
add clean and ignore rules for xdiff/
Remove dependency on a file named "-lz"
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -210,8 +210,8 @@ LIB_OBJS = \ fetch-clone.o revision.o pager.o \ $(DIFF_OBJS) -LIBS = $(LIB_FILE) $(XDIFF_LIB) -LIBS += -lz +GITLIBS = $(LIB_FILE) $(XDIFF_LIB) +LIBS = $(GITLIBS) -lz # # Platform specific tweaks @@ -545,7 +545,7 @@ init-db.o: init-db.c -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c $(LIB_OBJS): $(LIB_H) -$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS) +$(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS) $(DIFF_OBJS): diffcore.h $(LIB_FILE): $(LIB_OBJS) @@ -629,7 +629,8 @@ rpm: dist ### Cleaning rules clean: - rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE) + rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \ + $(LIB_FILE) $(XDIFF_LIB) rm -f $(ALL_PROGRAMS) git$X rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -rf $(GIT_TARNAME) |