From 1ffc924f0c34a3ef94f78d152c19d933eda1eecb Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 29 Oct 1999 13:57:53 +0000
Subject: [PATCH] [project @ 1999-10-29 13:55:40 by sof] attach version info

---
 ghc/lib/concurrent/Makefile |    8 ++++++--
 ghc/lib/exts/Makefile       |    6 +++++-
 ghc/lib/misc/Makefile       |    7 +++++--
 ghc/lib/misc/cbits/Makefile |   13 +++++++++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ghc/lib/concurrent/Makefile b/ghc/lib/concurrent/Makefile
index 99f5876..4aa7428 100644
--- a/ghc/lib/concurrent/Makefile
+++ b/ghc/lib/concurrent/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1999/10/05 10:30:27 simonmar Exp $
+# $Id: Makefile,v 1.9 1999/10/29 13:55:40 sof Exp $
 #
 # Makefile for concurrent libraries.
 #
@@ -48,9 +48,13 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 DLL_NAME = HSconc.dll
 DLL_IMPLIB_NAME = libHSconcurrent_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSconc.def
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSconc.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lHS_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits
 
+ifeq "$(way)" "dll"
+all :: DllVersionInfo.o
+endif
+
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
 #
diff --git a/ghc/lib/exts/Makefile b/ghc/lib/exts/Makefile
index 1bf2d90..c988665 100644
--- a/ghc/lib/exts/Makefile
+++ b/ghc/lib/exts/Makefile
@@ -63,9 +63,13 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -optdep--include-prelude -optdep-w $
 
 DLL_NAME = HSexts.dll
 DLL_IMPLIB_NAME = libHSexts_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSexts.def
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSexts.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lHS_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits
 
+ifeq "$(way)" "dll"
+all :: DllVersionInfo.o
+endif
+
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
 #
diff --git a/ghc/lib/misc/Makefile b/ghc/lib/misc/Makefile
index 5852b25..0d99904 100644
--- a/ghc/lib/misc/Makefile
+++ b/ghc/lib/misc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 1999/10/05 10:30:28 simonmar Exp $
+# $Id: Makefile,v 1.20 1999/10/29 13:57:52 sof Exp $
 #
 # Makefile for miscellaneous libraries.
 #
@@ -83,9 +83,12 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 DLL_NAME = HSmisc.dll
 DLL_IMPLIB_NAME = libHSmisc_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc.def
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lHScbits_imp -lHSmisc_cbits_imp -lHS_imp -lHSexts_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits -L../exts -Lcbits
 
+ifeq "$(way)" "dll"
+all :: DllVersionInfo.o
+endif
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
diff --git a/ghc/lib/misc/cbits/Makefile b/ghc/lib/misc/cbits/Makefile
index 32a15b8..53ba251 100644
--- a/ghc/lib/misc/cbits/Makefile
+++ b/ghc/lib/misc/cbits/Makefile
@@ -3,7 +3,12 @@
 #
 TOP=../../..
 include $(TOP)/mk/boilerplate.mk
+
+ifeq "$(filter dll,$(WAYS))" "dll"
+override WAYS=dll
+else
 override WAYS=
+endif
 
 CC:=$(GHC)
 
@@ -25,14 +30,18 @@ endif
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_LIB_DIR)/std/cbits
 
-LIBRARY=libHSmisc_cbits.a
+LIBRARY=libHSmisc_cbits$(_way).a
 LIBOBJS=$(C_OBJS)
 INSTALL_LIBS += $(LIBRARY)
 
 DLL_NAME = HSmisc_cbits.dll
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc_cbits.def
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc_cbits.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../../rts/gmp -L../../../rts -L../../std/cbits
 
+ifeq "$(way)" "dll"
+all :: DllVersionInfo.o
+endif
+
 ifeq "$(EnableWin32DLLs)" "YES"
 INSTALL_PROGS  += $(DLL_NAME)
 INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
-- 
1.7.10.4