From 52b8da7dfa4330328adb0df8c05fa63ac6ea97f6 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Wed, 24 Oct 2012 03:22:07 +0200
Subject: [PATCH] Added hack to make use of Makefile.inc.

This should avoid further maintainance of the objects list.
---
 NMakefile     | 11 ++++++++++-
 src/NMakefile | 25 ++-----------------------
 2 files changed, 12 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 src/NMakefile

diff --git a/NMakefile b/NMakefile
index b9e4a93..f3fcce1 100644
--- a/NMakefile
+++ b/NMakefile
@@ -1,9 +1,13 @@
 !include "win32/config.mk"
 
+!include "Makefile.inc"
+
+OBJECTS=$(CSOURCES:.c=.obj)
+
 # SUBDIRS=src example
 SUBDIRS=src
 
-all-sub:
+all-sub: win32\objects.mk
 	-for %D in ($(SUBDIRS)) do $(MAKE) /nologo /f %D/NMakefile BUILD=$(BUILD) SUBDIR=%D all-sub
 
 clean: 
@@ -15,5 +19,10 @@ real-clean vclean: clean
 	-del 2>NUL libssh2.ilk
 	-del 2>NUL libssh2.lib
 	-del 2>NUL *.pdb
+	-del 2>NUL win32\objects.mk
 
+win32\objects.mk: Makefile.inc
+	@echo OBJECTS = \>$@
+	@for %O in ($(OBJECTS)) do @echo $$(INTDIR)\%O \>>$@
+	@echo $$(EOL)>>$@
 
diff --git a/src/NMakefile b/src/NMakefile
old mode 100644
new mode 100755
index 2844eb8..faa3916
--- a/src/NMakefile
+++ b/src/NMakefile
@@ -1,29 +1,8 @@
 !include "win32/config.mk"
 
-CFLAGS=$(CFLAGS)
+!include "win32/objects.mk"
 
-OBJECTS = \
-	$(INTDIR)\agent.obj \
-	$(INTDIR)\channel.obj \
-	$(INTDIR)\comp.obj \
-	$(INTDIR)\crypt.obj \
-	$(INTDIR)\global.obj \
-	$(INTDIR)\hostkey.obj \
-	$(INTDIR)\keepalive.obj \
-	$(INTDIR)\kex.obj \
-	$(INTDIR)\knownhost.obj \
-	$(INTDIR)\mac.obj \
-	$(INTDIR)\misc.obj \
-	$(INTDIR)\openssl.obj \
-	$(INTDIR)\packet.obj \
-	$(INTDIR)\pem.obj \
-	$(INTDIR)\publickey.obj \
-	$(INTDIR)\scp.obj \
-	$(INTDIR)\session.obj \
-	$(INTDIR)\sftp.obj \
-	$(INTDIR)\transport.obj \
-	$(INTDIR)\userauth.obj \
-	$(INTDIR)\version.obj
+CFLAGS=$(CFLAGS)
 
 RESOURCE=$(INTDIR)\libssh2.res