X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;fp=ghc%2Fcompiler%2FMakefile;h=a7ed0355ff145b47941cdd241631cf989f2c0f46;hp=c1819f2cd269bcebd213caa4508bda25dc2240a0;hb=0065d5ab628975892cea1ec7303f968c3338cbe1;hpb=28a464a75e14cece5db40f2765a29348273ff2d2

diff --git a/ghc/compiler/Makefile b/compiler/Makefile
similarity index 97%
rename from ghc/compiler/Makefile
rename to compiler/Makefile
index c1819f2..a7ed035 100644
--- a/ghc/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Main ghc/compiler Makefile
+# Main compiler Makefile
 
 # Targets:
 #
@@ -602,8 +602,6 @@ SRC_HC_OPTS += '-\#include "hschooks.h"'
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt
 
-GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
-
 PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-tag.hs-incl  \
             primop-list.hs-incl  \
@@ -630,30 +628,30 @@ depend :: $(PRIMOP_BITS)
 endif
 
 primop-data-decl.hs-incl: prelude/primops.txt
-	$(GENPOC) --data-decl          < $< > $@
+	$(GENPRIMOP) --data-decl          < $< > $@
 primop-tag.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-tag         < $< > $@
+	$(GENPRIMOP) --primop-tag         < $< > $@
 primop-list.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-list        < $< > $@
+	$(GENPRIMOP) --primop-list        < $< > $@
 primop-has-side-effects.hs-incl: prelude/primops.txt
-	$(GENPOC) --has-side-effects   < $< > $@
+	$(GENPRIMOP) --has-side-effects   < $< > $@
 primop-out-of-line.hs-incl: prelude/primops.txt
-	$(GENPOC) --out-of-line        < $< > $@
+	$(GENPRIMOP) --out-of-line        < $< > $@
 primop-commutable.hs-incl: prelude/primops.txt
-	$(GENPOC) --commutable         < $< > $@
+	$(GENPRIMOP) --commutable         < $< > $@
 primop-needs-wrapper.hs-incl: prelude/primops.txt
-	$(GENPOC) --needs-wrapper      < $< > $@
+	$(GENPRIMOP) --needs-wrapper      < $< > $@
 primop-can-fail.hs-incl: prelude/primops.txt
-	$(GENPOC) --can-fail           < $< > $@
+	$(GENPRIMOP) --can-fail           < $< > $@
 primop-strictness.hs-incl: prelude/primops.txt
-	$(GENPOC) --strictness         < $< > $@
+	$(GENPRIMOP) --strictness         < $< > $@
 primop-primop-info.hs-incl: prelude/primops.txt
-	$(GENPOC) --primop-primop-info < $< > $@
+	$(GENPRIMOP) --primop-primop-info < $< > $@
 
 # Usages aren't used any more; but the generator 
 # can still generate them if we want them back
 primop-usage.hs-incl: prelude/primops.txt
-	$(GENPOC) --usage              < $< > $@
+	$(GENPRIMOP) --usage              < $< > $@
 
 
 #-----------------------------------------------------------------------------
@@ -663,7 +661,7 @@ primop-usage.hs-incl: prelude/primops.txt
 # libraries will be available from the main libraries.
 
 ifeq "$(stage)" "1"
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 endif
 
 SRC_LD_OPTS += -no-link-chk
@@ -676,7 +674,7 @@ all :: $(odir)/ghc-inplace ghc-inplace
 $(odir)/ghc-inplace : $(HS_PROG)
 	@$(RM) $@
 	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
+	echo exec $(GHC_COMPILER_DIR_ABS)/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
 	chmod 755 $@
 
 ghc-inplace : stage1/ghc-inplace
@@ -765,7 +763,7 @@ PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
 LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS))
 
 # disable splitting: it won't really help with GHC, and the specialised
-# build system for ghc/compiler isn't set up to handle it.
+# build system for compiler/ isn't set up to handle it.
 SplitObjs = NO
 
 # the package build system likes to set WAYS=$(GhcLibWays), but we don't