From c75ae587c0ce612932e7fd3017f957e9aa001b6b Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Sat, 10 Sep 2011 14:10:45 +0200
Subject: [PATCH] More MinGW makefile tweaks.

Renamed *.mingw makefiles to GNUmakefile since GNU make picks these
up automatically, and therefore win32/Makefile removed.
---
 Makefile.am                                | 10 ++++------
 win32/{Makefile.mingw => GNUmakefile}      | 12 ++++++------
 win32/Makefile                             |  1 -
 win32/test/{Makefile.mingw => GNUmakefile} | 12 +++---------
 4 files changed, 13 insertions(+), 22 deletions(-)
 rename win32/{Makefile.mingw => GNUmakefile} (95%)
 delete mode 100644 win32/Makefile
 rename win32/test/{Makefile.mingw => GNUmakefile} (94%)

diff --git a/Makefile.am b/Makefile.am
index 49f85c6..540155a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,12 +25,10 @@ VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl	\
 vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c	\
 vms/readme.vms vms/libssh2_config.h
 
-
-WIN32FILES = win32/Makefile.mingw win32/test/Makefile.mingw	\
-win32/libssh2.dsw win32/config.mk win32/Makefile		\
-win32/libssh2_config.h win32/tests.dsp win32/rules.mk $(DSP)	\
-win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc	\
-win32/Makefile.Watcom
+WIN32FILES = win32/GNUmakefile win32/test/GNUmakefile		\
+win32/libssh2_config.h win32/config.mk win32/rules.mk		\
+win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP)	\
+win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc
 
 EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \
  maketgz NMakefile TODO RELEASE-NOTES libssh2.pc.in $(VMSFILES)
diff --git a/win32/Makefile.mingw b/win32/GNUmakefile
similarity index 95%
rename from win32/Makefile.mingw
rename to win32/GNUmakefile
index 423b2ee..853a251 100644
--- a/win32/Makefile.mingw
+++ b/win32/GNUmakefile
@@ -1,9 +1,9 @@
 #########################################################################
 #
 ## Makefile for building libssh2 (Win32 version - gnu make)
-## Use: make -f Makefile.mingw [help|all|clean|dev|devclean|dist|distclean|dll|objclean]
+## Use: make -f GNUmakefile [help|all|clean|dev|devclean|dist|distclean|dll|objclean]
 ##
-## Comments to: Guenter Knauf http://www.gknw.net/phpbb
+## Hacked by: Guenter Knauf
 #
 #########################################################################
 
@@ -160,7 +160,7 @@ prebuild: $(OBJDIR) $(OBJDIR)/version.inc
 # libssh2_config.h
 
 test: all
-	$(MAKE) -C test -f Makefile.mingw
+	$(MAKE) -C test -f GNUmakefile
  
 $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
@@ -205,7 +205,7 @@ objclean: all
 	-$(RD) $(OBJDIR)
 
 testclean: clean
-	$(MAKE) -C test -f Makefile.win32 clean
+	$(MAKE) -C test -f GNUmakefile clean
 
 clean:
 #	-$(RM) libssh2_config.h
@@ -240,7 +240,7 @@ $(OBJDIR)/%.res: %.rc
 	@$(RC) $(RCFLAGS) $< -o $@
 
 
-$(DISTDIR)/readme.txt: Makefile.win32
+$(DISTDIR)/readme.txt: GNUmakefile
 	@echo Creating $@
 	@echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
 	@echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@
@@ -248,7 +248,7 @@ $(DISTDIR)/readme.txt: Makefile.win32
 	@echo $(DL)any further documentation:$(DL) >> $@
 	@echo $(DL)$(WWWURL)$(DL) >> $@
 
-$(DEVLDIR)/readme.txt: Makefile.win32
+$(DEVLDIR)/readme.txt: GNUmakefile
 	@echo Creating $@
 	@echo $(DL)This is a development distribution for Win32 platform.$(DL) > $@
 	@echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@
diff --git a/win32/Makefile b/win32/Makefile
deleted file mode 100644
index 5497a81..0000000
--- a/win32/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include Makefile.mingw
diff --git a/win32/test/Makefile.mingw b/win32/test/GNUmakefile
similarity index 94%
rename from win32/test/Makefile.mingw
rename to win32/test/GNUmakefile
index cf25204..5c06f65 100644
--- a/win32/test/Makefile.mingw
+++ b/win32/test/GNUmakefile
@@ -1,9 +1,9 @@
 #########################################################################
 #
 ## Makefile for building libssh2 samples (Win32 version - gnu make)
-## Use: make -f Makefile.mingw [help]
+## Use: make -f GNUmakefile [help]
 ##
-## Comments to: Guenter Knauf http://www.gknw.net/phpbb
+## Hacked by: Guenter Knauf
 #
 #########################################################################
 
@@ -76,12 +76,6 @@ ifdef METROWERKS
 else
 	CC = $(CROSSPREFIX)gcc
 endif
-CP	= cp -afv
-# RM	= rm -f
-# Here you can find a native Win32 binary of the original awk:
-# http://www.gknw.net/development/prgtools/awk-20070501.zip
-AWK	= awk
-ZIP	= zip -qzr9
 
 # Global flags for all compilers
 CFLAGS	= $(OPT) -D$(DB) -DWIN32 -DLIBSSH2_WIN32 # -DHAVE_CONFIG_H
@@ -177,7 +171,7 @@ $(OBJDIR)/%.res: $(OBJDIR)/%.rc
 	@echo Creating $@
 	@$(RC) $(RCFLAGS) $< -o $@
 
-$(OBJDIR)/%.rc: Makefile.win32 $(OBJDIR)/version.inc
+$(OBJDIR)/%.rc: GNUmakefile $(OBJDIR)/version.inc
 	@echo $(DL)1 VERSIONINFO$(DL) > $@
 	@echo $(DL) FILEVERSION $(LIBSSH2_VERSION),0$(DL) >> $@
 	@echo $(DL) PRODUCTVERSION $(LIBSSH2_VERSION),0$(DL) >> $@