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-03-26 23:47:17 by sof]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
4ba7746
..
2391322
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.5 2002/02/14 15:14:00 simonmar Exp $
+# $Id: package.mk,v 1.9 2002/02/22 22:20:25 panne Exp $
ifneq "$(PACKAGE)" ""
ifneq "$(PACKAGE)" ""
@@
-13,7
+13,7
@@
$(PACKAGE).conf.inplace : $(PACKAGE).conf.in
| sed 's/^#.*$$//g' >$@
$(PACKAGE).conf.installed : $(PACKAGE).conf.in
| sed 's/^#.*$$//g' >$@
$(PACKAGE).conf.installed : $(PACKAGE).conf.in
- $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLED -x c $(PACKAGE_CPP_OPTS) $< \
+ $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
| sed 's/^#.*$$//g' >$@
boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
@@
-61,8
+61,6
@@
all :: $(LIBRARY)
# -----------------------------------------------------------------------------
# Installation; need to install .hi files as well as libraries
# -----------------------------------------------------------------------------
# Installation; need to install .hi files as well as libraries
-INSTALL_LIBS += $(LIBRARY)
-
ifeq "$(DLLized)" "YES"
INSTALL_PROGS += $(DLL_NAME)
INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
ifeq "$(DLLized)" "YES"
INSTALL_PROGS += $(DLL_NAME)
INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
@@
-79,10
+77,12
@@
override datadir:=$(libdir)/imports/$(PACKAGE)
# structure when we install the interfaces.
ifeq "$(HIERARCHICAL_LIB)" "YES"
INSTALL_DATAS_WITH_DIRS += $(HS_IFACES)
# structure when we install the interfaces.
ifeq "$(HIERARCHICAL_LIB)" "YES"
INSTALL_DATAS_WITH_DIRS += $(HS_IFACES)
+ifneq "$(ALL_DIRS)" ""
install ::
@for i in $(ALL_DIRS); do \
$(INSTALL_DIR) $(datadir)/$$i; \
done
install ::
@for i in $(ALL_DIRS); do \
$(INSTALL_DIR) $(datadir)/$$i; \
done
+endif
else
INSTALL_DATAS += $(HS_IFACES)
endif
else
INSTALL_DATAS += $(HS_IFACES)
endif
@@
-95,6
+95,9
@@
SRC_MKDEPENDC_OPTS += $(patsubst %,-I%,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
endif # $(PACKAGE) /= ""
endif # $(PACKAGE) /= ""
+# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
+INSTALL_LIBS += $(LIBRARY)
+
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
@@
-125,7
+128,7
@@
ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
# when we can use a "fixed" ld.
#
$(GHCI_LIBRARY) : $(LIBOBJS)
# when we can use a "fixed" ld.
#
$(GHCI_LIBRARY) : $(LIBOBJS)
- $(LD) -r $(LD_X) -o $@ $(LIBOBJS)
+ $(LD) -r $(LD_X) -o $@ $(STUBOBJS) $(LIBOBJS)
endif # DONT_WANT_STD_GHCI_LIB_RULE
endif # GhcWithInterpreter
endif # DONT_WANT_STD_GHCI_LIB_RULE
endif # GhcWithInterpreter