Commit 7d74fdf5 authored by simonmar's avatar simonmar
Browse files

[project @ 2001-07-30 09:30:07 by simonmar]

clean up; move some code into more relevant parts of the file.
parent 5993e639
......@@ -301,19 +301,8 @@ else
$(HS_PROG) :: $(HS_OBJS)
$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
endif
endif
# Object and interface files have suffixes tagged with their ways
ifneq "$(way)" ""
SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
endif
# add syslib dependencies and current package name
SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
ifneq "$(PACKAGE)" ""
SRC_HC_OPTS += -package-name $(PACKAGE)
else
# No library, we are actually building the tools
# for building a Haskell program, we add FptoolsHcOpts
SRC_HC_OPTS += $(FptoolsHcOpts)
endif
......@@ -347,6 +336,10 @@ endif
ifneq "$(PACKAGE)" ""
# add syslib dependencies and current package name
SRC_HC_OPTS += -package-name $(PACKAGE)
SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
ifeq "$(IS_CBITS_LIB)" "YES"
_cbits := _cbits
STUBOBJS += $(HSC_C_OBJS)
......@@ -987,11 +980,11 @@ install-strip::
@$(MAKE) EXTRA_INSTALL_OPTS='-s' install
endif
###########################################
##############################################################################
#
# Targets: check tags show
#
###########################################
##############################################################################
#------------------------------------------------------------
# Check
......@@ -1029,11 +1022,14 @@ endif
#
show:
@echo '$(VALUE)=$($(VALUE))'
@echo '$(VALUE)="$($(VALUE))"'
#--------------------------------------------------------------------------
# SGML Documentation
################################################################################
#
# SGML Documentation
#
################################################################################
.PHONY: dvi ps html pdf rtf
ifneq "$(SGML_DOC)" ""
......@@ -1072,11 +1068,11 @@ extraclean ::
$(RM) -rf $(SGML_DOC)
endif
###########################################
##############################################################################
#
# Targets: clean
#
###########################################
##############################################################################
# we have to be careful about recursion here; since all the clean
# targets are recursive, we don't want to make eg. distclean depend on
......@@ -1101,11 +1097,11 @@ maintainer-clean:: extraclean
@echo 'deletes files that may need special tools to rebuild.'
rm -f $(MOSTLY_CLEAN_FILES) $(CLEAN_FILES) $(DIST_CLEAN_FILES) $(MAINTAINER_CLEAN_FILES)
#################################################################################
################################################################################
#
# Way management
#
#################################################################################
################################################################################
# Here is the ingenious jiggery pokery that allows you to build multiple versions
# of a program in a single build tree.
......@@ -1160,6 +1156,16 @@ $(LIB_WAY_TARGETS) :
endif # if way
# -------------------------------------------------------------------------
# Object and interface files have suffixes tagged with their ways
ifneq "$(way)" ""
SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
endif
# -------------------------------------------------------------------------
# Rules to invoke the current target recursively for each way
ifneq "$(WAYS)" ""
ifeq "$(way)" ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment