X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhsc2hs%2FMakefile;h=66fb9deb6f1821d6601b772c71e6ab251045856b;hb=d06b357cda38dc4ba0a639e455771ab8ecb498b2;hp=46041716fdf0379af4b27823af4a2a601cdf686b;hpb=98a18944251a82e0e2e8b6c25893eae0fd6811bb;p=ghc-hetmet.git

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 4604171..66fb9de 100644
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -3,10 +3,9 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal-flags.mk
 
-SRC_HC_OPTS      += -Wall
-
-CABAL = $(FPTOOLS_TOP_ABS)/libraries/cabal-bin \
-            $(GHC) $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
+# XXX We would like to turn this on, but Cabal generates paths files
+#     that are not -Wall clean!
+# SRC_HC_OPTS      += -Wall
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_FLAGS =
@@ -14,19 +13,30 @@ else
 INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
-boot:
-	$(CABAL) configure --distpref dist-inplace $(INPLACE_CONFIGURE_FLAGS)
+default all: with-bootstrapping-compiler
+
+with-bootstrapping-compiler:
+	$(CABAL) configure --distpref dist-inplace         \
+	                   $(INPLACE_DIRS_CONFIGURE_FLAGS) \
+	                   $(USE_BOOT_CONFIGURE_FLAGS)     \
+	                   $(COMMON_CONFIGURE_FLAGS)
 	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
 
-ifneq "$(NO_INSTALL_HSC2HS)" "YES"
-# XXX
-#all:
-#	$(CABAL) configure --distpref dist-install $(INSTALL_CONFIGURE_FLAGS)
-#	$(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
-endif
-
-all:
+with-stage-1:
+	$(CABAL) configure --distpref dist-install         \
+	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+	                   $(USE_STAGE1_CONFIGURE_FLAGS)   \
+	                   $(COMMON_CONFIGURE_FLAGS)
+	$(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
+
+install:
+	$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+	                   '$(prefix)' '$(bindir)' '$(libdir)'            \
+                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
+                       '$(docdir)' '$(htmldir)' '$(haddockdir)'
+	                   --distpref dist-install                        \
+	                   $(INSTALL_FLAGS)
 
 clean: distclean