projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SPARC build, missing #include
[ghc-hetmet.git]
/
includes
/
Makefile
diff --git
a/includes/Makefile
b/includes/Makefile
index
4b89d52
..
a0923c3
100644
(file)
--- a/
includes/Makefile
+++ b/
includes/Makefile
@@
-12,7
+12,7
@@
H_PLATFORM = ghcplatform.h
#
# All header files
#
#
# All header files
#
-H_FILES = $(filter-out gmp.h $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h)) gmp.h
+H_FILES = $(filter-out $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h))
ifneq "$(DOING_BIN_DIST)" "YES"
ifneq "$(DOING_BIN_DIST)" "YES"
@@
-27,20
+27,21
@@
ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
endif
SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE
endif
-SRC_CC_OPTS += -I. -I../rts
+SRC_CC_OPTS += -I. -I../rts -I../rts/parallel
+ifeq "$(HaveLibGmp)" "YES"
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+endif
+else
+SRC_CC_OPTS += -I../gmp/gmpbuild
+endif
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
endif
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
endif
-boot :: gmp.h
-
all :: $(H_CONFIG) $(H_PLATFORM)
all :: $(H_CONFIG) $(H_PLATFORM)
-# gmp.h is copied from the GMP directory
-gmp.h : $(FPTOOLS_TOP)/rts/gmp/gmp.h
- $(CP) $< $@
-
# The fptools configure script creates the configuration header file and puts it
# in fptools/mk/config.h. We copy it down to here (without any PACKAGE_FOO
# definitions to avoid clashes), prepending some make variables specifying cpp
# The fptools configure script creates the configuration header file and puts it
# in fptools/mk/config.h. We copy it down to here (without any PACKAGE_FOO
# definitions to avoid clashes), prepending some make variables specifying cpp
@@
-170,19
+171,14
@@
endif
#
# Install all header files
#
#
# Install all header files
#
-# Hackily set the install destination here:
-#
# Note: we keep per-platform copies of all the include files
# (ditto for interface files). This is not *really* needed, but
# it gives (perhaps) a cleaner binary dist structure..might change.
#
# Note: we keep per-platform copies of all the include files
# (ditto for interface files). This is not *really* needed, but
# it gives (perhaps) a cleaner binary dist structure..might change.
#
-override datadir:=$(libdir)/include
-INSTALL_DATAS += $(H_FILES) $(H_CONFIG) $(H_PLATFORM)
+INSTALL_HEADERS += $(H_FILES) $(H_CONFIG) $(H_PLATFORM)
-binary-dist:
- $(INSTALL_DIR) $(BIN_DIST_DIR)/includes
- $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/includes/
- $(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/includes/
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk
#
# `make clean' settings:
#
# `make clean' settings: