[project @ 2000-05-12 11:48:30 by rrt]

[ghc-hetmet.git] / ghc / lib / std / cbits / Makefile

diff --git a/ghc/lib/std/cbits/Makefile b/ghc/lib/std/cbits/Makefile
index 9132b6e..853da87 100644 (file)
--- a/ghc/lib/std/cbits/Makefile
+++ b/ghc/lib/std/cbits/Makefile
@@ -1,21 +1,23 @@
-# $Id: Makefile,v 1.11 1999/12/07 15:49:53 simonmar Exp $
+# $Id: Makefile,v 1.19 2000/05/12 11:48:30 rrt Exp $
 
 TOP = ../../..
 include $(TOP)/mk/boilerplate.mk
 
+WAYS=$(GhcLibWays)
+
 ifeq "$(filter dll,$(WAYS))" "dll"
 override WAYS=dll
 else
 override WAYS=
 endif
 
-LIBRARY=libHS_cbits$(_way).a
+LIBRARY=libHSstd_cbits$(_way).a
 
 C_SRCS= $(wildcard *.c)
 
 C_OBJS  = $(C_SRCS:.c=.$(way_)o)
 LIBOBJS = $(C_OBJS)
-SRC_CC_OPTS += -O -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) $(GhcLibCcOpts)
+SRC_CC_OPTS += -O -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) $(GhcLibCcOpts) -Wall
 
 ifneq "$(way)" "dll"
 SRC_CC_OPTS += -static
@@ -27,10 +29,10 @@ all :: DllVersionInfo.o
 $(DLL_NAME) : DllVersionInfo.o
 endif
 
-DLL_NAME = HScbits.dll
-DLL_IMPLIB_NAME = libHScbits_imp.a
+DLL_NAME = HSstd_cbits.dll
+DLL_IMPLIB_NAME = libHSstd_cbits_imp.a
 DLL_DESCRIPTION = "Haskell Prelude helpers"
-SRC_BLD_DLL_OPTS += --export-all --output-def=HScbits.def DllVersionInfo.o
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSstdcbits.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lgmp -L. -L../../../rts/gmp -L../../../rts
 
 #
@@ -47,8 +49,10 @@ INSTALL_LIBS+=$(LIBRARY)
 
 ifeq "$(EnableWin32DLLs)" "YES"
 INSTALL_PROGS  += $(DLL_NAME)
+ifneq "$(way)" "dll"
 INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
 endif
+endif
 
 # install header files for the I/O library.  Other code might want to
 # plug