[project @ 2001-07-13 11:39:48 by rrt]

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

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index b8815d5..4548978 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -25,21 +25,20 @@ 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
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
+SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts)
 ifneq "$(ILXized)" "YES"
 SRC_HSC2HS_OPTS += -Icbits
 endif
@@ -111,7 +110,7 @@ GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 #              Standard rule
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
+HSstd.o :: $(GHCI_LIBOBJS)
        ld -r -x -o $@ $(GHCI_LIBOBJS)
 
 else
@@ -120,7 +119,7 @@ else
 HSstd.o :: $(GHCI_LIBOBJS)
        ld -r -x -o HSstd1.o $(filter     Prel%, $(GHCI_LIBOBJS))
        ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))
-endif # TARGETPLATFORM = win32
+endif # TARGETPLATFORM = i386-unknown-mingw32
 
 
 
@@ -152,8 +151,6 @@ INSTALL_DATAS += PrelGHC.$(way_)hi
 
 
 ilxstd:
-       (cd //c/devel/fcom/src; make ilxsdk)
-       (cd ../../compiler; make)
        $(MAKE) way=ilx-Onot-mono std.ilx-Onot.mono.dll std.ilx-Onot.mono.vlb
        $(MAKE) way=ilx-O-mono  std.ilx-O.mono.dll std.ilx-O.mono.vlb
        $(MAKE) way=ilx-Onot-generic std.ilx-Onot.generic.dll