X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=61ce5f21e3d107c4f11c2fb93ada62e4ff649dc9;hb=e9db07b2af145dba541f82aeec1b626f572f485f;hp=f1085cb1dba1f768d822fa0da8d9ea9785f54b25;hpb=9049e3999806a851fa898beac447ba1a00507511;p=ghc-base.git

diff --git a/Makefile b/Makefile
index f1085cb..61ce5f2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ ALL_DIRS = \
 	System/Mem \
 	System/IO \
 	System/Posix \
+	System/Process \
+	System/Directory \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
@@ -35,17 +37,11 @@ ALL_DIRS = \
 	Text/Read
 
 PACKAGE = base
+VERSION = 1.0
 
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
 SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
 
-# If there is no system-supplied POSIX regex library, use our own
-ifneq "$(HavePosixRegex)" "YES"
-# Make sure we can get hold of regex.h
-SRC_HC_OPTS     += -Icbits/regex
-SRC_HSC2HS_OPTS += -Icbits/regex
-endif
-
 # -----------------------------------------------------------------------------
 # Per-module flags
 
@@ -101,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
 
@@ -122,13 +118,16 @@ SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
 
 # -----------------------------------------------------------------------------
 
-include $(TOP)/mk/target.mk
+GHC/ForeignPtr.o Data/Array/IO/Internals.o Data/Array/Base.o \
+  Data/Generics/Instances.o Data/Complex.o Data/Array.o Data/STRef.o \
+  Data/Dynamic.o Data/Typeable.o Data/PackedString.o System/Mem/Weak.o \
+  System/Mem/StableName.o System/Posix/Types.o Control/Monad/ST.o \
+  Control/Exception.o Foreign/C/Types.o Foreign/ForeignPtr.o: include/Typeable.h
 
-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
+System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
+# -----------------------------------------------------------------------------
+
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status config.mk
+
+include $(TOP)/mk/target.mk