Permalink
Browse files

Remove shuffle from build infrastructure and use 'shuffle' executable…

… as found by configure instead
  • Loading branch information...
1 parent 42654c4 commit c6af0d37943a0530b0e5f7fc1660c8c7100f5961 @jbransen jbransen committed Nov 28, 2012
Showing with 11 additions and 3 deletions.
  1. +0 −3 EHC/Makefile
  2. +11 −0 EHC/mk/shared.mk.in
View
@@ -57,7 +57,6 @@ include $(MK_PREFIX)shared.mk
-include $(SRC_PREFIX)helium/files.mk
-include $(SRC_PREFIX)lvm/files.mk
-include $(SRC_PREFIX)text2text/files.mk
-include $(SRC_PREFIX)shuffle/files.mk
include $(SRC_PREFIX)ruler2/files.mk
include $(SRC_PREFIX)ehc/variant.mk
include $(SRC_PREFIX)gen/files.mk
@@ -143,7 +142,6 @@ explanation:
echo "make <n>/bare : make bare source dir for variant <n> (in bare/)," ; \
echo " then 'cd' to there and 'make'" ; \
echo "make $(RULER2_NAME) : make ruler tool" ; \
- echo "make $(SHUFFLE_NAME) : make shuffle tool" ; \
echo "" ; \
echo "Documentation" ; \
echo "=============" ; \
@@ -381,7 +379,6 @@ test: uhc-test
clean:
$(MAKE) cleans
$(MAKE) ruler-clean
- $(MAKE) shuffle-clean
rm -rf $(DIST_PREFIX)
# $(MAKE) libutil-clean
View
@@ -230,6 +230,7 @@ EHCLIB_SHARED := @EHCLIB_SHARED@
# compilers and tools used
AGC := @UUAGC_CMD@
+SHUFFLE := @SHUFFLE_CMD@
GHC := @GHC_CMD@
GHC1 := @GHC_CMD1@
GHC_VERSION := @GHC_VERSION@
@@ -258,6 +259,16 @@ PDFLATEX := TEXINPUTS=".$(PATHS_SEP_COL)../../$(LATEX_SRC_PREFIX)$(PATHS_SEP
BIBTEX := BSTINPUTS=".$(PATHS_SEP_COL)../../$(LATEX_SRC_PREFIX)$(PATHS_SEP_COL)$(LATEX_ENV)" BIBINPUTS=".$(PATHS_SEP_COL)../../$(LATEX_SRC_PREFIX)$(LATEX_ENV)" bibtex
MAKEINDEX := makeindex
+# shuffle
+SHUFFLE_HS := $(SHUFFLE) --hs --preamble=no --lhs2tex=no --line=yes --compiler=$(GHC_VERSION)
+SHUFFLE_HS_PRE := $(SHUFFLE) --hs --preamble=yes --lhs2tex=no --line=yes --compiler=$(GHC_VERSION)
+SHUFFLE_AG := $(SHUFFLE) --ag --preamble=no --lhs2tex=no --line=no --compiler=$(GHC_VERSION)
+SHUFFLE_AG_PRE := $(SHUFFLE) --ag --preamble=yes --lhs2tex=no --line=no --compiler=$(GHC_VERSION)
+SHUFFLE_PLAIN := $(SHUFFLE) --plain --preamble=no --lhs2tex=no --line=no
+SHUFFLE_C := $(SHUFFLE_PLAIN)
+SHUFFLE_JAVA := $(SHUFFLE_PLAIN)
+SHUFFLE_JS := $(SHUFFLE_PLAIN)
+
# misc
# $1: files to md5
ifneq (@MD5_CMD@,)

0 comments on commit c6af0d3

Please sign in to comment.