From 1fb2bd70b75659f958d81e87b0267a7e183aaf06 Mon Sep 17 00:00:00 2001
From: Peter Kahle <pkahle@kahlilia.org>
Date: Thu, 22 Apr 2010 15:49:19 -0400
Subject: [PATCH] Rename 64bit shell extension to allow both to exist.

It would seem to make sense to allow both the 32bit and 64bit
shell extension under windows to exist at the same time, so
I've renamed in the 64bit environment from git_shell_ext.dll to
git_shell_ext64.dll.

Also added a platform-clean target which is just like clean, but
only deletes the dll for the context for which make is being
called.

Signed-off-by: Peter Kahle <pkahle@kahlilia.org>
---
 explorer/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/explorer/Makefile b/explorer/Makefile
index 94d1102..fca6b55 100755
--- a/explorer/Makefile
+++ b/explorer/Makefile
@@ -1,9 +1,13 @@
+TARGET64=git_shell_ext64.dll
+TARGET32=git_shell_ext.dll
 ifneq (,$(W64))
 cross = /src/mingw-w64/sysroot/bin/x86_64-w64-mingw32-
 WIN32_IE=0x0501
+TARGET=$(TARGET64)
 else
 cross = ""
 WIN32_IE=0x0500
+TARGET=$(TARGET32)
 endif
 
 CC = $(cross)gcc.exe
@@ -31,7 +35,6 @@ endif
 CFLAGS=-O -g -DNO_MMAP -DNO_PREAD -DNO_STRLCPY -D_WIN32_IE=$(WIN32_IE) $(OSCFLAGS)
 DLLWRAPFLAGS = -Wl,--enable-stdcall-fixup $(OSDLLWRAPFLAG)
 
-TARGET=git_shell_ext.dll
 MSYSGIT_PATH=$(shell cd /; pwd -W | sed -e 's|/|\\\\\\\\|g')
 
 # export compile flags to sub-make of the common folder
@@ -70,6 +73,9 @@ install-user: all
 uninstall-user: all
 	regsvr32 -u -s $(DLL_PATH)
 
-clean:
+platform-clean:
 	-rm -f $(OBJECTS) $(COMPAT_OBJ) $(TARGET) deps
 	$(MAKE) -C ../common clean
+
+clean: platform-clean
+	-rm -f  $(TARGET32) $(TARGET64)
-- 
2.11.4.GIT