From 09dc60b4d73f290ccad37a086a6f867fe11efa44 Mon Sep 17 00:00:00 2001 From: KatolaZ Date: Sun, 29 Jul 2018 06:16:42 +0100 Subject: patch and plain diff works --- cgit_70.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cgit_70.mk') diff --git a/cgit_70.mk b/cgit_70.mk index 165e8bc..eecc1d3 100644 --- a/cgit_70.mk +++ b/cgit_70.mk @@ -69,7 +69,7 @@ ifdef HAVE_LINUX_SENDFILE endif #CGIT_OBJ_NAMES += cgit.o -CGIT_OBJ_NAMES += cgit_70.o +CGIT_OBJ_NAMES += cgit-70.o CGIT_OBJ_NAMES += cache.o #CGIT_OBJ_NAMES += cmd.o CGIT_OBJ_NAMES += cmd_70.o @@ -89,7 +89,8 @@ CGIT_OBJ_NAMES += ui_70-commit.o CGIT_OBJ_NAMES += ui_70-diff.o ##CGIT_OBJ_NAMES += ui-log.o CGIT_OBJ_NAMES += ui_70-log.o -CGIT_OBJ_NAMES += ui-patch.o +##CGIT_OBJ_NAMES += ui-patch.o +CGIT_OBJ_NAMES += ui_70-patch.o CGIT_OBJ_NAMES += ui-plain.o ##CGIT_OBJ_NAMES += ui-refs.o CGIT_OBJ_NAMES += ui_70-refs.o @@ -111,7 +112,7 @@ CGIT_OBJS := $(addprefix $(CGIT_PREFIX),$(CGIT_OBJ_NAMES)) # Only cgit.c reference CGIT_VERSION so we only rebuild its objects when the # version changes. ##CGIT_VERSION_OBJS := $(addprefix $(CGIT_PREFIX),cgit.o cgit.sp) -CGIT_VERSION_OBJS := $(addprefix $(CGIT_PREFIX),cgit_70.o cgit.sp) +CGIT_VERSION_OBJS := $(addprefix $(CGIT_PREFIX),cgit-70.o cgit.sp) $(CGIT_VERSION_OBJS): $(CGIT_PREFIX)VERSION $(CGIT_VERSION_OBJS): EXTRA_CPPFLAGS = \ -DCGIT_VERSION='"$(CGIT_VERSION)"' @@ -141,7 +142,7 @@ $(CGIT_PREFIX)CGIT-CFLAGS: FORCE $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs) $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $< -$(CGIT_PREFIX)cgit_70: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS) +$(CGIT_PREFIX)cgit-70: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS) @echo 1>&1 " * $(LUA_MESSAGE)" $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS) -- cgit v1.2.3