projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-01-15 05:39:14 by sof]
[ghc-hetmet.git]
/
ghc
/
rts
/
Makefile
diff --git
a/ghc/rts/Makefile
b/ghc/rts/Makefile
index
27eeb21
..
c01d5e2
100644
(file)
--- a/
ghc/rts/Makefile
+++ b/
ghc/rts/Makefile
@@
-1,5
+1,5
@@
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.51 2001/07/03 16:57:03 sewardj Exp $
+# $Id: Makefile,v 1.56 2002/01/15 05:39:15 sof Exp $
#
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
#
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
@@
-51,7
+51,7
@@
WARNING_OPTS += -Winline
WARNING_OPTS += -Waggregate-return
#WARNING_OPTS += -Wpointer-arith
WARNING_OPTS += -Wbad-function-cast
WARNING_OPTS += -Waggregate-return
#WARNING_OPTS += -Wpointer-arith
WARNING_OPTS += -Wbad-function-cast
-#WARNING_OPTS += -Wcast-align
+WARNING_OPTS += -Wcast-align
#WARNING_OPTS += -Wnested-externs
#WARNING_OPTS += -Wshadow
#WARNING_OPTS += -Wcast-qual
#WARNING_OPTS += -Wnested-externs
#WARNING_OPTS += -Wshadow
#WARNING_OPTS += -Wcast-qual
@@
-105,6
+105,7
@@
SRC_MKDEPENDC_OPTS += -I. -I../includes
ifeq "$(BootingFromHc)" "YES"
# use the normal $(CC) when booting from .hc files
SRC_CC_OPTS += $(HC_OPTS)
ifeq "$(BootingFromHc)" "YES"
# use the normal $(CC) when booting from .hc files
SRC_CC_OPTS += $(HC_OPTS)
+SRC_CC_OPTS += -I../includes -I. -Iparallel -DCOMPILING_RTS
else
# otherwise, use $(GHC_INPLACE) as the C compiler.
CC=$(GHC_INPLACE)
else
# otherwise, use $(GHC_INPLACE) as the C compiler.
CC=$(GHC_INPLACE)
@@
-120,7
+121,7
@@
unexport CC
#
# Building DLLs is only supported on mingw32 at the moment.
#
#
# Building DLLs is only supported on mingw32 at the moment.
#
-HSLIB = rts
+PACKAGE = rts
ifeq "$(DLLized)" "YES"
SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
ifeq "$(DLLized)" "YES"
SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
@@
-175,18
+176,21
@@
endif
install :: gmp/libgmp.a
install :: gmp/libgmp.a
+ifeq "$(way)" ""
clean distclean maintainer-clean ::
clean distclean maintainer-clean ::
- $(MAKE) -C gmp MAKEFLAGS= $@
+ -$(MAKE) -C gmp MAKEFLAGS= $@
-ifeq "$(way)" ""
INSTALL_LIBS += gmp/libgmp.a
endif
gmp/libgmp.a ::
$(MAKE) -C gmp MAKEFLAGS=
@$(CP) gmp/.libs/libgmp.a gmp
INSTALL_LIBS += gmp/libgmp.a
endif
gmp/libgmp.a ::
$(MAKE) -C gmp MAKEFLAGS=
@$(CP) gmp/.libs/libgmp.a gmp
+ @$(RANLIB) gmp/libgmp.a
endif
endif
+CLEAN_FILES += gmp/libgmp.a
+
#-----------------------------------------------------------------------------
#
# Building the GUM SysMan
#-----------------------------------------------------------------------------
#
# Building the GUM SysMan