From a51e80459c2703d1906a4e1646de47def3550a09 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Aug 2005 15:27:13 +0000
Subject: [PATCH] * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub:
 integrated   macro definitions.

* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.

* {win32,wince}/Makefile.sub: separate config.h for compiler versions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  9 +++++++++
 Makefile.in        |  6 ------
 bcc32/Makefile.sub | 11 +++++------
 common.mk          |  2 ++
 win32/Makefile.sub | 11 ++++-------
 wince/Makefile.sub | 11 ++++-------
 wince/setup.mak    |  1 +
 7 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab26d272f9..80e8df405b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
+	  macro definitions.
+
+	* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+
+	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
+
 Thu Aug  4 00:24:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c: replacing is no longer needed.
diff --git a/Makefile.in b/Makefile.in
index 6d7cde1021..dfa63afd5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,12 +78,6 @@ ARFLAGS       = rcu
 RANLIB        = @RANLIB@
 
 OBJEXT        = @OBJEXT@
-
-EXTOBJS	      = 
-DLDOBJS	      = $(DMYEXT)
-
-MAINOBJ	      = main.$(OBJEXT)
-
 MANTYPE	      = @MANTYPE@
 
 #### End of variables
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 5b51846c77..3f19841697 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -168,7 +168,6 @@ LIBRUBYARG    = $(LIBRUBY)
 
 PREP          = miniruby$(EXEEXT)
 
-DMYOBJS       = dmyext.obj
 OBJEXT        = obj
 
 WINMAINOBJ    = winmain.$(OBJEXT)
@@ -416,16 +415,16 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
 
-$(LIBRUBY_A):	$(OBJS) dmyext.obj
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
 		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
+		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
 
 # $(LIBRUBY):	$(LIBRUBY_SO)
 #		implib $@ $(LIBRUBY_SO)
 
-$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(EXTOBJS)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
+$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo $(DLDOBJS)
+		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
 
 $(LIBRUBY): $(LIBRUBY_SO)
 
diff --git a/common.mk b/common.mk
index c03e19c57a..fcfd52db73 100644
--- a/common.mk
+++ b/common.mk
@@ -9,6 +9,8 @@ RBCONFIG      = ./.rbconfig.time
 
 DMYEXT	      = dmyext.$(OBJEXT)
 MAINOBJ	      = main.$(OBJEXT)
+EXTOBJS	      = 
+DLDOBJS	      = $(DMYEXT)
 
 OBJS	      = array.$(OBJEXT) \
 		ascii.$(OBJEXT) \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 89ec5cad37..0647b5fc3f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -172,9 +172,6 @@ EXTSTATIC     =
 
 OBJEXT = obj
 
-EXTOBJS       = 
-DLDOBJS       = 
-
 WINMAINOBJ    = winmain.$(OBJEXT)
 MINIOBJS      = dmydln.$(OBJEXT)
 
@@ -214,13 +211,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
 #define HAVE_PROTOTYPES 1
 #define TOKEN_PASTE(x,y) x##y
 #define HAVE_STDARG_PROTOTYPES 1
-#if _MSC_VER > 1100
+!if $(MSC_VER) > 1100
 #define NORETURN(x) __declspec(noreturn) x
-#endif
-#if _MSC_VER >= 1300
+!endif
+!if $(MSC_VER) >= 1300
 #define DEPRECATED(x) __declspec(deprecated) x
 #define NOINLINE(x) __declspec(noinline) x
-#endif
+!endif
 #define HAVE_DECL_SYS_NERR 1
 #define HAVE_LIMITS_H 1
 #define HAVE_FCNTL_H 1
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index d2639c9152..71a7df2167 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -176,9 +176,6 @@ EXTSTATIC     =
 
 OBJEXT = obj
 
-EXTOBJS       = 
-DLDOBJS       = 
-
 WINMAINOBJ    = wincemain.$(OBJEXT)
 
 all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
@@ -219,13 +216,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
 #define HAVE_PROTOTYPES 1
 #define TOKEN_PASTE(x,y) x##y
 #define HAVE_STDARG_PROTOTYPES 1
-#if _MSC_VER > 1100
+!if $(MSC_VER) > 1100
 #define NORETURN(x) __declspec(noreturn) x
-#endif
-#if _MSC_VER >= 1300
+!endif
+!if $(MSC_VER) >= 1300
 #define DEPRECATED(x) __declspec(deprecated) x
 #define NOINLINE(x) __declspec(noinline) x
-#endif
+!endif
 #define HAVE_DECL_SYS_NERR 1
 #define HAVE_FCNTL_H 1
 #define HAVE_SYS_UTIME_H 1
diff --git a/wince/setup.mak b/wince/setup.mak
index 629ea993e4..d2dbad2317 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -64,6 +64,7 @@ EXTOUT = $(EXTOUT)
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
 TEENY = RUBY_VERSION_TEENY
+MSC_VER = _MSC_VER
 <<
 
 -generic-: nul