X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=61ce5f21e3d107c4f11c2fb93ada62e4ff649dc9;hb=d968106fdef283b30d06ae45fa2f87329e1c2269;hp=4513585043e4517904da17956153afb1fdecaf60;hpb=85f61fe85c3e314c1726199549e51fc30042f402;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index 4513585..61ce5f2 100644
--- a/Makefile
+++ b/Makefile
@@ -97,11 +97,11 @@ endif
 ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
-DONT_WANT_STD_GHCI_LIB_RULE=YES
+#DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
+INSTALL_LIBS += HSbase.o
 
 endif # OBJECT_FILEFORMAT = PEi
 
@@ -128,16 +128,6 @@ System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += HsBaseConfig.h base.buildinfo config.cache config.status 
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status config.mk
 
 include $(TOP)/mk/target.mk
-
-ifeq "$(OBJECT_FILEFORMAT)" "PEi"
-HSbase.o : $(GHCI_LIBOBJS)
-	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-	$(LD) -r $(LD_X) -o HSbase2.o $(filter     Text/%, $(GHCI_LIBOBJS))
-	$(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS) $(STUBOBJS))
-	@touch HSbase.o
-endif # OBJECT_FILEFORMAT = PEi
-