From b728b1018fdfa850423d31cd7609895445a3042e Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Thu, 3 Sep 2009 21:59:47 +0200
Subject: [PATCH] changed NetWare and MingW32 makefile to use Makefile.inc.

---
 nw/Makefile.netware  | 25 ++++---------------------
 win32/Makefile.win32 | 24 ++++--------------------
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/nw/Makefile.netware b/nw/Makefile.netware
index b641063..4e53abb 100644
--- a/nw/Makefile.netware
+++ b/nw/Makefile.netware
@@ -184,8 +184,7 @@ ifdef XDCOPT
 	XDCDATA = $(OBJDIR)/$(TARGET).xdc
 endif
 
-ifeq ($(findstring linux,$(OSTYPE)),linux)
-#-include $(NDKBASE)/nlmconv/ncpfs.inc
+ifeq ($(findstring /sh,$(SHELL)),/sh)
 DL	= '
 DS	= /
 else
@@ -194,25 +193,10 @@ endif
 
 vpath %.c . ../src
 
-OBJECTS = \
-	channel.o \
-	comp.o \
-	crypt.o \
-	hostkey.o \
-	kex.o \
-	knownhost.o \
-	mac.o \
-	misc.o \
-	openssl.o \
-	packet.o \
-	pem.o \
-	publickey.o \
-	scp.o \
-	session.o \
-	sftp.o \
-	transport.o \
-	userauth.o
+# include Makefile.inc to get CSOURCES define
+include ../Makefile.inc
 
+OBJECTS := $(patsubst %.c,%.o,$(CSOURCES))
 ifeq ($(LIBARCH),CLIB)
 # CLIB lacks of snprint() function - here's a replacement:
 # http://www.ijs.si/software/snprintf/
@@ -221,7 +205,6 @@ vpath %.c $(SNPRINTF)
 endif
 
 OBJS	:= $(addprefix $(OBJDIR)/,$(OBJECTS))
-
 OBJL	= $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
 
 all: lib nlm
diff --git a/win32/Makefile.win32 b/win32/Makefile.win32
index d55c2b4..4dd96e0 100644
--- a/win32/Makefile.win32
+++ b/win32/Makefile.win32
@@ -121,8 +121,7 @@ endif
 
 CFLAGS	+= $(INCLUDES)
 
-#ifeq ($(findstring msys,$(OSTYPE)),msys)
-ifdef __MSYS__
+ifeq ($(findstring /sh,$(SHELL)),/sh)
 DL	= '
 DS	= /
 else
@@ -131,25 +130,10 @@ endif
 
 vpath %.c . ../src
 
-OBJECTS = \
-	channel.o \
-	comp.o \
-	crypt.o \
-	hostkey.o \
-	kex.o \
-	knownhost.o \
-	mac.o \
-	misc.o \
-	openssl.o \
-	packet.o \
-	pem.o \
-	publickey.o \
-	scp.o \
-	session.o \
-	sftp.o \
-	transport.o \
-	userauth.o
+# include Makefile.inc to get CSOURCES define
+include ../Makefile.inc
 
+OBJECTS	:= $(patsubst %.c,%.o,$(CSOURCES))
 OBJS	:= $(addprefix $(OBJDIR)/,$(OBJECTS))
 OBJL	= $(OBJS) $(OBJDIR)/$(TARGET).res