diff options
| -rw-r--r-- | ghc/lib/std/Makefile | 7 | ||||
| -rw-r--r-- | ghc/lib/std/cbits/Makefile | 4 | ||||
| -rw-r--r-- | ghc/rts/Makefile | 4 | ||||
| -rw-r--r-- | mk/target.mk | 34 |
4 files changed, 24 insertions, 25 deletions
diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 214d582660..c1c3e90f97 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -25,14 +25,13 @@ endif HC = $(GHC_INPLACE) -ifneq "$(DLLized)" "YES" -PACKAGE = -package-name std -else +# *** THIS WON'T WORK ANY MORE *** (PACKAGE is now set in fptools/mk/target.mk) +ifeq "$(DLLized)" "YES" # Hack by SPJ to delay if-then-else until the pattern rule when we have $* PACKAGE = $(subst ~, ,$(word $(words dummy $(findstring $(notdir $*), PrelMain )), -package-name~std)) endif -HSLIB = std +PACKAGE = std BOOT_SRCS += PrelPrimopWrappers.hs diff --git a/ghc/lib/std/cbits/Makefile b/ghc/lib/std/cbits/Makefile index bcbf048560..6111a9d294 100644 --- a/ghc/lib/std/cbits/Makefile +++ b/ghc/lib/std/cbits/Makefile @@ -1,9 +1,9 @@ -# $Id: Makefile,v 1.29 2001/05/18 22:34:42 qrczak Exp $ +# $Id: Makefile,v 1.30 2001/07/05 13:01:16 rrt Exp $ TOP = ../../.. include $(TOP)/mk/boilerplate.mk -HSLIB = std +PACKAGE = std IS_CBITS_LIB = YES SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 27eeb213e1..d9d9a762eb 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.51 2001/07/03 16:57:03 sewardj Exp $ +# $Id: Makefile,v 1.52 2001/07/05 13:01:16 rrt Exp $ # # This is the Makefile for the runtime-system stuff. # This stuff is written in C (and cannot be written in Haskell). @@ -120,7 +120,7 @@ unexport CC # # Building DLLs is only supported on mingw32 at the moment. # -HSLIB = rts +PACKAGE = rts ifeq "$(DLLized)" "YES" SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp diff --git a/mk/target.mk b/mk/target.mk index b67ede90c9..57b5628c86 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -309,9 +309,9 @@ SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o endif # add syslib dependencies and current package name -SRC_HC_OPTS += $(patsubst %, -package %, $(HSLIB_DEPS)) +SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) ifneq "$(PACKAGE)" "" -SRC_HC_OPTS += -package-name $(HSLIB) +SRC_HC_OPTS += -package-name $(PACKAGE) endif #---------------------------------------- @@ -329,7 +329,7 @@ endif # Building HsLibs libraries. # # Inputs: -# $(HSLIB) is the name of the library to build +# $(PACKAGE) is the name of the library to build # $(IS_CBITS_LIB) should be "YES" for a "cbits" library # # Outputs: @@ -342,14 +342,14 @@ endif # on whether or not it's a "cbits" library. But you can # override this by setting $(LIBOBJS) yourself -ifneq "$(HSLIB)" "" +ifneq "$(PACKAGE)" "" ifeq "$(IS_CBITS_LIB)" "YES" _cbits := _cbits endif -LIBRARY = libHS$(HSLIB)$(_cbits)$(_way).a -GHCI_LIBRARY = HS$(HSLIB)$(_cbits)$(_way).o +LIBRARY = libHS$(PACKAGE)$(_cbits)$(_way).a +GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o ifneq "$(IS_CBITS_LIB)" "YES" WAYS=$(GhcLibWays) @@ -368,12 +368,12 @@ SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) ifeq "$(IS_CBITS_LIB)" "YES" override datadir:=$(libdir)/includes -INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(HSLIB)"').h +INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h else SRC_CC_OPTS += -Icbits endif -endif # HSLIB +endif # PACKAGE #---------------------------------------- # Libraries/archives @@ -500,7 +500,7 @@ ifneq "$(GHCI_LIBRARY)" "HSstd.o" # So we only put in this standard rule for packages other than std # The rule for the Prelude is in ghc/lib/std/Makefile # We check for GHCI_LIBRARY being HSstd.o rather than -# HSLIB being std, because we want to still use the boilerplate rule +# PACKAGE being std, because we want to still use the boilerplate rule # for cbits. $(GHCI_LIBRARY) :: $(LIBOBJS) ld -r -x -o $@ $(LIBOBJS) $(STUBOBJS) @@ -517,13 +517,13 @@ endif # GHCI_LIBRARY ifeq "$(DLLized)" "YES" -ifneq "$(HSLIB)" "" +ifneq "$(PACKAGE)" "" -SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(HSLIB)$(_cbits)$(_way).def DllVersionInfo.$(way_)o -ifneq "$(HSLIB)" "rts" +SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(PACKAGE)$(_cbits)$(_way).def DllVersionInfo.$(way_)o +ifneq "$(PACKAGE)" "rts" SRC_BLD_DLL_OPTS += -lHSstd_cbits_imp -L$(GHC_LIB_DIR)/std/cbits SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RUNTIME_DIR) -ifneq "$(HSLIB)" "std" +ifneq "$(PACKAGE)" "std" ifeq "$(IS_CBITS_LIB)" "" SRC_BLD_DLL_OPTS += -lHSstd_$(way_)imp -L$(GHC_LIB_DIR)/std endif @@ -531,15 +531,15 @@ endif endif SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RUNTIME_DIR)/gmp ifeq "$(IS_CBITS_LIB)" "" -SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(HSLIB_DEPS)) -SRC_BLD_DLL_OPTS += $(patsubst %,-L../%, $(HSLIB_DEPS)) +SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(PACKAGE_DEPS)) +SRC_BLD_DLL_OPTS += $(patsubst %,-L../%, $(PACKAGE_DEPS)) endif ifneq "$(HAS_CBITS)" "" -SRC_BLD_DLL_OPTS += -lHS$(HSLIB)_cbits_imp -Lcbits +SRC_BLD_DLL_OPTS += -lHS$(PACKAGE)_cbits_imp -Lcbits endif SRC_BLD_DLL_OPTS += -lwsock32 -lwinmm -endif # HSLIB != "" +endif # PACKAGE != "" SplitObjs = NO |