X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ea574e11064720ca356b06dafc9602de80ce4237;hb=2a4d586c8abefa2b0d2a782c421697fd6cf0c964;hp=e9f90d37d753e56256cc287a5e2f723af9b75f23;hpb=d8ca7c9ed01c99475367520dcd4906571355a4a1;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index e9f90d3..ea574e1 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -62,13 +62,7 @@ SUBDIRS += $(wildcard QuickCheck)
 SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
-SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
-ifeq "$(Windows)" "NO"
-# HGL is not working on Win32, so omit it for now.  Better not to ship it
-# at all than to ship a broken version.
-SUBDIRS += $(wildcard HGL)
-endif
 SUBDIRS += $(wildcard OpenGL)
 SUBDIRS += $(wildcard GLUT)
 SUBDIRS += $(wildcard OpenAL)
@@ -76,7 +70,6 @@ SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard cgi)
-SUBDIRS += $(wildcard arrows)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
@@ -285,7 +278,9 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 	   cd $* && setup/Setup makefile -f GNUmakefile; \
 	fi
 
-.PHONY: doc
+.PHONY: doc html
+
+html: doc
 
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
@@ -393,3 +388,10 @@ binary-dist.library.%:
 	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
 	     -exec rm {} \; ; \
 	fi
+
+# Ignore some doc targets that we don't support
+# The root recurses into us when these targets are made
+.PHONY: html-no-chunks chm HxS fo dvi ps pdf
+html-no-chunks chm HxS fo dvi ps pdf:
+	@:
+