summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-05-14 12:58:04 +0000
committerIan Lynagh <igloo@earth.li>2009-05-14 12:58:04 +0000
commit7afa90fe13588f1cc0d2dd2e1ae16ef77496490c (patch)
tree23c80e1d39e873f09abfa1167129ef2b3c266295
parented100fb327234aa0d75e0d5c74432c1ff26c0536 (diff)
downloadhaskell-7afa90fe13588f1cc0d2dd2e1ae16ef77496490c.tar.gz
Remove left-over bits of extralib support
-rw-r--r--ghc.mk6
-rw-r--r--packages12
2 files changed, 0 insertions, 18 deletions
diff --git a/ghc.mk b/ghc.mk
index 3d5ead2642..4d2a29a084 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -799,10 +799,7 @@ SRC_DIST_FILES += \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk
-EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^\#" | sed "s/ .*//"))
-
SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
-SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
VERSION :
echo $(ProjectVersion) >VERSION
@@ -849,8 +846,6 @@ sdist-prep :
.PHONY: sdist
sdist : sdist-prep
- $(TAR) chf - $(EXTRA_LIBS) | bzip2 >$(TOP)/$(SRC_DIST_EXTRALIBS_TARBALL)
- $(RM) -rf $(EXTRA_LIBS)
$(TAR) chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL)
sdist-manifest : $(SRC_DIST_TARBALL)
@@ -861,7 +856,6 @@ sdist-manifest : $(SRC_DIST_TARBALL)
# over SSH.
ifneq "$(PublishLocation)" ""
publish-sdist :
- $(call nTimes,10,$(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist)
$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
endif
diff --git a/packages b/packages
index 9bb5b9af98..cfc0cb01cd 100644
--- a/packages
+++ b/packages
@@ -46,18 +46,6 @@ libraries/terminfo packages/terminfo darcs
libraries/unix packages/unix darcs
libraries/utf8-string packages/utf8-string darcs
libraries/Win32 packages/Win32 darcs
-libraries/HUnit extralibs packages/HUnit darcs
-libraries/QuickCheck extralibs packages/QuickCheck darcs
-libraries/haskell-src extralibs packages/haskell-src darcs
-libraries/html extralibs packages/html darcs
-libraries/network extralibs packages/network darcs
-libraries/parsec extralibs packages/parsec darcs
-libraries/parallel extralibs packages/parallel darcs
-libraries/regex-base extralibs packages/regex-base darcs
-libraries/regex-compat extralibs packages/regex-compat darcs
-libraries/regex-posix extralibs packages/regex-posix darcs
-libraries/stm extralibs packages/stm darcs
-libraries/xhtml extralibs packages/xhtml darcs
libraries/dph dph packages/dph darcs
testsuite testsuite testsuite darcs
nofib nofib nofib darcs