X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fcabal.mk;h=3d525d77390643533c5a797f7de0d0fcddb0995e;hp=f8d2b7b091c729ac876340607795dd8e685c1984;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=5c9f239daf46aaa73e12c8b948659fa5cd7e77fb

diff --git a/mk/cabal.mk b/mk/cabal.mk
index f8d2b7b..3d525d7 100644
--- a/mk/cabal.mk
+++ b/mk/cabal.mk
@@ -1,9 +1,8 @@
 
 include $(TOP)/mk/cabal-flags.mk
+include $(TOP)/mk/bindist.mk
 
-# XXX We would like to turn this on, but Cabal generates paths files
-#     that are not -Wall clean!
-# SRC_HC_OPTS      += -Wall
+SRC_HC_OPTS      += -Wall
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_FLAGS =
@@ -15,7 +14,14 @@ INSTALL_FLAGS =
 endif
 endif
 
-.PHONY: default all with-bootstrapping-compiler with-stage-1 clean distclean
+# Tell stage2 to make a dynamically-linked binary, but no wrapper.  We assume
+# that in an installation the shared libs will be installed somewhere that
+# the system can find them.
+ifeq "$(BuildSharedLibs)" "YES"
+DYN_FLAGS = --ghc-option=-dynamic --ghc-option=-dynload --ghc-option=deploy
+endif
+
+.PHONY: default all with-bootstrapping-compiler with-stage-2 clean distclean
 
 default all: with-bootstrapping-compiler
 
@@ -28,30 +34,35 @@ with-bootstrapping-compiler:
 	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
 
-with-stage-1:
+with-stage-2:
 	$(CABAL) configure --distpref dist-install         \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-	                   $(USE_STAGE1_CONFIGURE_FLAGS)   \
+	                   $(USE_STAGE2_CONFIGURE_FLAGS)   \
 	                   $(COMMON_CONFIGURE_FLAGS)       \
-	                   $(EXTRA_STAGE1_CONFIGURE_FLAGS)
-	$(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
+	                   $(EXTRA_STAGE2_CONFIGURE_FLAGS)
+	$(CABAL) build     --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS)
 
 install:
-	$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+	$(INSTALL_PACKAGE) install                                        \
+	                   '$(GHC_PKG_INSTALL_PROG)'                      \
+	                   '$(DESTDIR)$(datadir)/package.conf'            \
+	                   '$(DESTDIR)' '$(prefix)'                       \
 	                   '$(prefix)' '$(bindir)' '$(libdir)'            \
-                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
-                       '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
+	                   '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
+	                   '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
 	                   --distpref dist-install                        \
 	                   $(INSTALL_FLAGS)
 
-clean: distclean
-
-distclean:
+clean:
 	-$(CABAL) clean --distpref dist-inplace
 	-$(CABAL) clean --distpref dist-install
+	$(RM) -rf install-inplace
 ifneq "$(EXTRA_CLEAN)" ""
 	$(RM) -f $(EXTRA_CLEAN)
 endif
 
-# XXX fix binary-dist
+distclean: clean
+ifneq "$(EXTRA_DISTCLEAN)" ""
+	$(RM) -f $(EXTRA_DISTCLEAN)
+endif