X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=119e1be68fec61ce3737ca90bd5992b64914212d;hb=31796c5c0312aa9a04f3519fa32b0f15b9a14541;hp=e112f5b9bb26880b27bd3d5ced85b6f81c4d09d8;hpb=d2f3c920294ca769dd637a90efade3d5d433894b;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index e112f5b..119e1be 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1,3 +1,15 @@
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
 # ToDo List.
 #
 # Before we can merge the new build system into HEAD:
@@ -296,15 +308,29 @@ PACKAGES += \
 	syb \
 	template-haskell \
 	base3-compat \
-	Cabal
+	Cabal \
+	mtl \
+	utf8-string
+
+ifneq "$(Windows)" "YES"
+PACKAGES += terminfo
+endif
+
+PACKAGES += haskeline
 
 BOOT_PKGS = Cabal hpc extensible-exceptions
 
-# The actual .a files: needed for dependencies.
+# The actual .a and .so/.dll files: needed for dependencies.
 ALL_LIBS  = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB))
+ifeq "$(BuildSharedLibs)" "YES"
+ALL_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB))
+endif
 BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
 
-OTHER_LIBS = libffi/libHSffi.a libffi/HSffi.o
+OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o
+ifeq "$(BuildSharedLibs)" "YES"
+OTHER_LIBS  += libffi/libHSffi$(dyn_libsuf)
+endif
 ifeq "$(HaveLibGmp)" "NO"
 OTHER_LIBS += gmp/libgmp.a
 endif
@@ -828,12 +854,22 @@ clean_files :
 
 distclean : clean
 	$(RM) config.cache config.status config.log mk/config.h mk/stamp-h
-	$(RM) mk/config.mk mk/are-validating.mk
+	$(RM) mk/config.mk mk/are-validating.mk mk/project.mk
 	$(RM) extra-gcc-opts docs/users_guide/ug-book.xml
 	$(RM) compiler/ghc.cabal ghc/ghc-bin.cabal
 	$(RM) libraries/base/include/HsBaseConfig.h
 	$(RM) libraries/directory/include/HsDirectoryConfig.h
+	$(RM) libraries/process/include/HsProcessConfig.h
+	$(RM) libraries/unix/include/HsUnixConfig.h
+	$(RM) libraries/old-time/include/HsTimeConfig.h
 
 maintainer-clean : distclean
+	$(RM) configure mk/config.h.in
+	$(RM) -r autom4te.cache libraries/*/autom4te.cache
 	$(RM) ghc.spec
-	$(RM) libraries/*/GNUmakefile
+	$(RM) libraries/*/GNUmakefile libraries/*/ghc.mk libraries/*/configure 
+	$(RM) libraries/base/include/HsBaseConfig.h.in
+	$(RM) libraries/directory/include/HsDirectoryConfig.h.in
+	$(RM) libraries/process/include/HsProcessConfig.h.in
+	$(RM) libraries/unix/include/HsUnixConfig.h.in
+	$(RM) libraries/old-time/include/HsTimeConfig.h.in