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

diff --git a/libraries/Makefile b/libraries/Makefile
index baebe74..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
@@ -353,7 +348,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage '$(GHC_PKG_INPLACE)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+	  ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -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:
+	@:
+