diff options
| author | sof <unknown> | 1999-09-17 10:43:54 +0000 |
|---|---|---|
| committer | sof <unknown> | 1999-09-17 10:43:54 +0000 |
| commit | 68ee122facf9b3723d2baf4e1441ac2f2238e1f0 (patch) | |
| tree | d81eb911ccb54cba9549b5a1a1ffc57c2e49c5cd /ghc/lib/misc | |
| parent | cc61e7196d217a7c8261214208123fce234cb4fb (diff) | |
| download | haskell-68ee122facf9b3723d2baf4e1441ac2f2238e1f0.tar.gz | |
[project @ 1999-09-17 10:43:51 by sof]
DLL building tweaks, including terrible hack to compile PrelMain
Diffstat (limited to 'ghc/lib/misc')
| -rw-r--r-- | ghc/lib/misc/Makefile | 15 | ||||
| -rw-r--r-- | ghc/lib/misc/cbits/Makefile | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/ghc/lib/misc/Makefile b/ghc/lib/misc/Makefile index e3468d5487..2da481ed28 100644 --- a/ghc/lib/misc/Makefile +++ b/ghc/lib/misc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.17 1999/08/06 10:55:26 simonmar Exp $ +# $Id: Makefile,v 1.18 1999/09/17 10:43:52 sof Exp $ # # Makefile for miscellaneous libraries. # @@ -19,7 +19,10 @@ endif # LIBRARY = libHSmisc$(_way).a -HS_SRCS = $(wildcard *.lhs) + +ifeq "$(EnableWin32DLLs)" "YES" + HS_SRCS := $(filter-out Select.lhs,$(HS_SRCS)) +endif # Remove Readline.lhs if readline.h isn't available. ifneq "$(GhcLibsWithReadline)" "YES" @@ -79,7 +82,7 @@ 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 += -lwinmm -lwsock32 -lHSrts_imp -lHS_cbits_imp -lHSmisc_cbits_imp -lHS_imp -lHSexts_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits -L../exts -Lcbits +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 #----------------------------------------------------------------------------- @@ -99,5 +102,11 @@ override datadir:=$(libdir)/imports/misc INSTALL_LIBS += $(LIBRARY) INSTALL_DATAS += $(HS_IFACES) +ifeq "$(EnableWin32DLLs)" "YES" +INSTALL_PROGS += $(DLL_NAME) +INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY)) +INSTALL_DATAS += dLL_ifs.hi +endif + include $(TOP)/mk/target.mk diff --git a/ghc/lib/misc/cbits/Makefile b/ghc/lib/misc/cbits/Makefile index 379073f2ed..69feafe119 100644 --- a/ghc/lib/misc/cbits/Makefile +++ b/ghc/lib/misc/cbits/Makefile @@ -14,6 +14,14 @@ ifneq "$(HAVE_READLINE)" "YES" C_SRCS := $(filter-out ghcReadline.c,$(C_SRCS)) endif +ifeq "$(EnableWin32DLLs)" "YES" + C_SRCS := $(filter-out selectFrom.c,$(C_SRCS)) +endif + +ifneq "$(way)" "dll" +SRC_CC_OPTS += -static +endif + SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_LIB_DIR)/std/cbits @@ -23,6 +31,11 @@ INSTALL_LIBS += $(LIBRARY) DLL_NAME = HSmisc_cbits.dll SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc_cbits.def -SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lHS_cbits_imp -lgmp -L. -L../../../rts/gmp -L../../../rts -L../../std/cbits +SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../../rts/gmp -L../../../rts -L../../std/cbits + +ifeq "$(EnableWin32DLLs)" "YES" +INSTALL_PROGS += $(DLL_NAME) +INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY)) +endif include $(TOP)/mk/target.mk |