From 142b2807d06477370c38f0da63897c0428b232d8 Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Tue, 20 Jan 2004 15:00:03 +0000
Subject: [PATCH] One more rework for support MinGW

---
 GNUmakef.def          | 23 ++++++-----------------
 golded3/Makefile      | 13 ++++---------
 goldlib/gall/Makefile | 12 ++++--------
 goldnode/Makefile     | 12 ++++--------
 rddt/Makefile         | 12 ++++--------
 5 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/GNUmakef.def b/GNUmakef.def
index 16f4263..fc3e976 100644
--- a/GNUmakef.def
+++ b/GNUmakef.def
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-ifeq ($(TERM),msys)
-MSYS=true
+ifeq ($(TERM),cygwin)
+MINGW=true
 else
 ifeq ($(OSTYPE),msys)
-MSYS=true
+MINGW=true
 endif
 endif
 
@@ -40,7 +40,7 @@ EXEEXT=.exe
 OBJEXT=.o
 LIBEXT=.a
 else
-ifeq ($(TERM),cygwin)
+ifdef MINGW
 CAT=cat
 CC=gcc -mno-cygwin
 CXX=g++ -mno-cygwin
@@ -48,19 +48,9 @@ AR=ar
 RANLIB=ranlib
 WINDRES=windres
 PLATFORM=cyg
+ifeq ($(OSTYPE),msys)
 SHELL=bash
-EXEEXT=.exe
-OBJEXT=.o
-LIBEXT=.a
-else
-ifdef MSYS
-CAT=cat
-CC=gcc
-CXX=g++
-AR=ar
-RANLIB=ranlib
-WINDRES=windres
-PLATFORM=cyg
+endif
 EXEEXT=.exe
 OBJEXT=.o
 LIBEXT=.a
@@ -90,7 +80,6 @@ endif
 endif
 endif
 endif
-endif
 CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
 LNKFLAGS+=-g
 CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
diff --git a/golded3/Makefile b/golded3/Makefile
index 64316ee..60ca389 100644
--- a/golded3/Makefile
+++ b/golded3/Makefile
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-ifeq ($(TERM),msys)
-MSYS=true
+ifeq ($(TERM),cygwin)
+MINGW=true
 else
 ifeq ($(OSTYPE),msys)
-MSYS=true
+MINGW=true
 endif
 endif
 
@@ -18,14 +18,9 @@ ifeq ($(findstring EMX, $(PATH)), EMX)
 STDLIBS=-los2me -lstdcpp
 GLIBS+=glibc
 else
-ifeq ($(TERM),cygwin)
+ifdef MINGW
 STDLIBS=-luser32 -lwinmm
 GLIBS+=glibc
-else
-ifdef MSYS
-STDLIBS=-luser32 -lwinmm
-GLIBS+=glibc
-endif
 endif
 endif
 
diff --git a/goldlib/gall/Makefile b/goldlib/gall/Makefile
index 9ed399e..1c655e1 100644
--- a/goldlib/gall/Makefile
+++ b/goldlib/gall/Makefile
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-ifeq ($(TERM),msys)
-MSYS=true
+ifeq ($(TERM),cygwin)
+MINGW=true
 else
 ifeq ($(OSTYPE),msys)
-MSYS=true
+MINGW=true
 endif
 endif
 
@@ -14,12 +14,8 @@ INCS=-I$(TOP)/goldlib/gall
 ifeq ($(findstring EMX, $(PATH)), EMX)
 INCS+=-I$(TOP)/goldlib/glibc
 else
-ifeq ($(TERM),cygwin)
+ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
-else
-ifdef MSYS
-INCS+=-I$(TOP)/goldlib/glibc
-endif
 endif
 endif
 
diff --git a/goldnode/Makefile b/goldnode/Makefile
index 4e88d95..881652e 100644
--- a/goldnode/Makefile
+++ b/goldnode/Makefile
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-ifeq ($(TERM),msys)
-MSYS=true
+ifeq ($(TERM),cygwin)
+MINGW=true
 else
 ifeq ($(OSTYPE),msys)
-MSYS=true
+MINGW=true
 endif
 endif
 
@@ -15,12 +15,8 @@ INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/golded3/
 ifeq ($(findstring EMX, $(PATH)), EMX)
 STDLIBS=-lstdcpp
 else
-ifeq ($(TERM),cygwin)
+ifdef MINGW
 STDLIBS=-luser32
-else
-ifdef MSYS
-STDLIBS=-luser32
-endif
 endif
 endif
 GLIBS=gall
diff --git a/rddt/Makefile b/rddt/Makefile
index 3aba83b..24a9ccf 100644
--- a/rddt/Makefile
+++ b/rddt/Makefile
@@ -1,10 +1,10 @@
 # -*- makefile -*-
 
-ifeq ($(TERM),msys)
-MSYS=true
+ifeq ($(TERM),cygwin)
+MINGW=true
 else
 ifeq ($(OSTYPE),msys)
-MSYS=true
+MINGW=true
 endif
 endif
 
@@ -15,12 +15,8 @@ INCS=-I$(TOP)/goldlib/gall
 ifeq ($(findstring EMX, $(PATH)), EMX)
 STDLIBS=-lstdcpp
 else
-ifeq ($(TERM),cygwin)
+ifdef MINGW
 STDLIBS=-luser32
-else
-ifdef MSYS
-STDLIBS=-luser32
-endif
 endif
 endif
 GLIBS=gall