diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | docs/Makefile | 6 | ||||
| -rw-r--r-- | docs/index.html (renamed from ghc/docs/index.html) | 0 | ||||
| -rw-r--r-- | ghc/Makefile | 54 | ||||
| -rw-r--r-- | ghc/configure.ac | 40 | ||||
| -rw-r--r-- | ghc/docs/Makefile | 12 | ||||
| -rw-r--r-- | quickcheck/HeaderInfoTests.hs (renamed from ghc/quickcheck/HeaderInfoTests.hs) | 0 | ||||
| -rw-r--r-- | quickcheck/README (renamed from ghc/quickcheck/README) | 0 | ||||
| -rw-r--r-- | quickcheck/RunTests.hs (renamed from ghc/quickcheck/RunTests.hs) | 0 | ||||
| -rw-r--r-- | quickcheck/run.sh (renamed from ghc/quickcheck/run.sh) | 0 |
10 files changed, 7 insertions, 107 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 139a262601..765647e1ea 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1114,6 +1114,6 @@ test -z "$ProjectPatchLevel" && ProjectPatchLevel=0 ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'` AC_SUBST([ProjectPatchLevel]) -])# FP_SETUP_PROJECT_INFO +])# FP_SETUP_PROJECT_VERSION # LocalWords: fi diff --git a/docs/Makefile b/docs/Makefile index b384a934c6..267de1dbf7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,4 +3,10 @@ include $(TOP)/mk/boilerplate.mk SUBDIRS = building docbook-cheat-sheet ext-core storage-mgt users_guide +PAGES = index.html + +install-docs :: $(PAGES) + $(INSTALL_DIR) $(datadir)/html + $(INSTALL_DATA) $(INSTALL_OPTS) $(PAGES) $(datadir)/html + include $(TOP)/mk/target.mk diff --git a/ghc/docs/index.html b/docs/index.html index 204e20a378..204e20a378 100644 --- a/ghc/docs/index.html +++ b/docs/index.html diff --git a/ghc/Makefile b/ghc/Makefile deleted file mode 100644 index cacc3f7c8e..0000000000 --- a/ghc/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.30 2005/03/02 14:35:05 simonmar Exp $ -# - -TOP=. -include $(TOP)/mk/boilerplate.mk - -# -# subdir dependencies: -# everything needs utils -# utils needs lib -# includes/ needs driver (to easily c.pile mkNativeGen.c) -# make depend except in {utils,driver} needs includes -# RTS and compiler need includes -# - -# -# Order is important! It's e.g. necessary to descend into include/ -# before the rest to have a config.h, etc. -# -# If we're booting from .hc files, swap the order -# we descend into subdirs - to boot utils must be before driver. -# -ifeq "$(BootingFromHc)" "YES" -SUBDIRS = includes rts docs compiler lib utils driver -else -ifneq "$(ILXized)" "YES" -SUBDIRS = includes lib utils driver docs compiler rts -else -# No RTS for ILX -SUBDIRS = includes lib utils driver docs compiler -endif -endif - -SRC_DIST_FILES += configure - -# Clean everything created by configure: -DIST_CLEAN_FILES += VERSION config.cache config.status ghc.spec \ - docs/users_guide/ug-book.xml - -# don't clean version.mk: it's needed when cleaning stuff later on -LATE_DIST_CLEAN_FILES += mk/config.mk - -extraclean:: - $(RM) -rf autom4te.cache - -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# These files need to be in the InstallShield -# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go -# in the top-level directory of the distribution -INSTALL_DATAS += ANNOUNCE LICENSE README VERSION -endif - -include $(TOP)/mk/target.mk diff --git a/ghc/configure.ac b/ghc/configure.ac deleted file mode 100644 index b6d9a4cb84..0000000000 --- a/ghc/configure.ac +++ /dev/null @@ -1,40 +0,0 @@ -# Initialise and check sanity. -AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc]) -AC_CONFIG_SRCDIR([ghc.spec.in]) - -# duplicate from ../configure.ac -AC_ARG_WITH([ghc], -[AC_HELP_STRING([--with-ghc=ARG], - [Use ARG as the path to GHC [default=autodetect]])], - [WithGhc="$withval"], - [if test "$GHC" = ""; then - AC_PATH_PROG([GHC], [ghc]) - fi - WithGhc="$GHC"]) -AC_SUBST([WithGhc]) - -FP_SETUP_PROJECT_INFO - -# Hmmm, we fix the RPM release number to 1 here... Is this convenient? -AC_SUBST([release], [1]) - -FP_GCC_NEEDS_NO_OMIT_LFPTR - -# Check whether this GHC has readline installed -FP_GHC_HAS_READLINE - -# test for GTK+ -AC_PATH_PROGS([GTK_CONFIG], [pkg-config]) -if test -n "$GTK_CONFIG"; then - if $GTK_CONFIG gtk+-2.0 --atleast-version=2.0; then - GTK_CONFIG="$GTK_CONFIG gtk+-2.0" - else - AC_MSG_WARN([GTK+ not usable, need at least version 2.0]) - GTK_CONFIG= - fi -fi -AC_SUBST([GTK_CONFIG]) - -# Write the results... -AC_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml mk/config.mk mk/version.mk]) -AC_OUTPUT diff --git a/ghc/docs/Makefile b/ghc/docs/Makefile deleted file mode 100644 index f34b5090f6..0000000000 --- a/ghc/docs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = .. -include $(TOP)/mk/boilerplate.mk - -SUBDIRS = building users_guide ext-core storage-mgt - -PAGES = index.html - -install-docs :: $(PAGES) - $(INSTALL_DIR) $(datadir)/html - $(INSTALL_DATA) $(INSTALL_OPTS) $(PAGES) $(datadir)/html - -include $(TOP)/mk/target.mk diff --git a/ghc/quickcheck/HeaderInfoTests.hs b/quickcheck/HeaderInfoTests.hs index 6f8bef6239..6f8bef6239 100644 --- a/ghc/quickcheck/HeaderInfoTests.hs +++ b/quickcheck/HeaderInfoTests.hs diff --git a/ghc/quickcheck/README b/quickcheck/README index 251bc807e0..251bc807e0 100644 --- a/ghc/quickcheck/README +++ b/quickcheck/README diff --git a/ghc/quickcheck/RunTests.hs b/quickcheck/RunTests.hs index 4aabb48584..4aabb48584 100644 --- a/ghc/quickcheck/RunTests.hs +++ b/quickcheck/RunTests.hs diff --git a/ghc/quickcheck/run.sh b/quickcheck/run.sh index cff728abee..cff728abee 100644 --- a/ghc/quickcheck/run.sh +++ b/quickcheck/run.sh |