X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhsc2hs%2FMakefile;h=699aa80a7dc0033b5fd053683f5c34b01c672dbf;hb=cc4da37aa4e75294823ad2356d2352b32a1d30ea;hp=42a831b506427f3a2b75cd47bdc045ed37cf5cc9;hpb=9b70ae2db513be48a1c07bad7ee52ebb4b39132e;p=ghc-hetmet.git

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 42a831b..699aa80 100644
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -1,89 +1,46 @@
-# -----------------------------------------------------------------------------
-# To compile with nhc98 on unix:
-#     nhc98 -cpp -package base -o hsc2hs-bin Main.hs
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
 
-# This causes libghccompat.a to be used:
-include $(GHC_COMPAT_DIR)/compat.mk
+# XXX We would like to turn this on, but Cabal generates paths files
+#     that are not -Wall clean!
+# SRC_HC_OPTS      += -Wall
 
-# This is required because libghccompat.a must be built with
-# $(GhcHcOpts) because it is linked to the compiler, and hence
-# we must also build with $(GhcHcOpts) here:
-SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
+CABAL = $(FPTOOLS_TOP_ABS)/libraries/cabal-bin \
+            $(GHC) $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
-HS_PROG           = hsc2hs-bin
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-HS_PROG           = hsc2hs$(exeext)
-endif
-ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
-HS_PROG           = hsc2hs$(exeext)
+INSTALL_FLAGS =
+else
+INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
-# Note: Somehow we should pass $(exeext) here, but the history of changes used
-# for calling the C preprocessor via GHC has changed a few times, making a
-# clean solution impossible. So we revert to a hack in Main.hs...
-SRC_HC_OPTS      += -Wall
-
-# -----------------------------------------------------------------------------
-# hsc2hs script
+boot:
+	$(CABAL) configure --distpref dist-inplace $(INPLACE_CONFIGURE_FLAGS)
+	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
+	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
+ifneq "$(NO_INSTALL_HSC2HS)" "YES"
+# XXX
+#all:
+#	$(CABAL) configure --distpref dist-install $(INSTALL_CONFIGURE_FLAGS)
+#	$(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
 endif
-HSC2HS_INPLACE_EXTRA=--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_INCLUDE_DIR_REL)
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-# See "MSys Note 3" in compiler/Makefile
-INPLACE_SCRIPT=hsc2hs-inplace.bat
-FULL_INPLACE_PATH=$(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/utils/hsc2hs/)
-all::
-	$(RM) -f $(INPLACE_SCRIPT)
-	echo '@call $(FULL_INPLACE_PATH)$(HS_PROG) --template=$(FULL_INPLACE_PATH)template-hsc.h $(HSC2HS_INPLACE_EXTRA) %*' >> $(INPLACE_SCRIPT)
-	$(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
-else
-INPLACE_SCRIPT=hsc2hs-inplace
-all::
-	$(RM) -f $(INPLACE_SCRIPT)
-	echo "#!$(SHELL)"                                                   >> $(INPLACE_SCRIPT)
-	echo "HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)"       >> $(INPLACE_SCRIPT)
-	echo "HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_HSC2HS_DIR_REL)" >> $(INPLACE_SCRIPT)
-	echo "HS_PROG=$(HS_PROG)"                                           >> $(INPLACE_SCRIPT)
-	echo "HSC2HS_EXTRA=\"$(HSC2HS_INPLACE_EXTRA)\""                     >> $(INPLACE_SCRIPT)
-	cat hsc2hs.sh                                                       >> $(INPLACE_SCRIPT)
-	$(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
-endif
-CLEAN_FILES += $(INPLACE_SCRIPT)
-
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_PROGS    += $(HS_PROG)
-else
-INSTALL_LIBEXECS += $(HS_PROG)
-LINK = hsc2hs
-LINK_TARGET = $(LINK)-$(ProjectVersion)
-INSTALLED_SCRIPT=$(bindir)/$(LINK_TARGET)
-install::
-	$(RM) -f $(INSTALLED_SCRIPT)
-	echo "#!$(SHELL)"                  >> $(INSTALLED_SCRIPT)
-	echo "HSC2HS_BINDIR=$(libexecdir)" >> $(INSTALLED_SCRIPT)
-	echo "HSC2HS_DIR=$(libdir)"        >> $(INSTALLED_SCRIPT)
-	echo "HS_PROG=$(HS_PROG)"          >> $(INSTALLED_SCRIPT)
-	echo "HSC2HS_EXTRA="               >> $(INSTALLED_SCRIPT)
-	cat hsc2hs.sh                      >> $(INSTALLED_SCRIPT)
-	$(EXECUTABLE_FILE) $(INSTALLED_SCRIPT)
-endif
+all:
 
-# -----------------------------------------------------------------------------
+clean: distclean
 
-override datadir=$(libdir)
-INSTALL_DATAS += template-hsc.h
+distclean:
+	-$(CABAL) clean --distpref dist-inplace
+	-$(CABAL) clean --distpref dist-install
 
-binary-dist:
-	$(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
-	$(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
-	$(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
-	$(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
-	$(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+# XXX fix:
+#binary-dist:
+#	$(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
+#	$(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
+#	$(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
+#	$(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
+#	$(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
 
-include $(TOP)/mk/target.mk