projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-03-22 06:37:57 by wolfgang]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
098e189
..
d77eb33
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.47 2005/02/09 10:11:36 simonmar Exp $
+# $Id: package.mk,v 1.49 2005/03/03 21:01:49 wolfgang Exp $
ifneq "$(PACKAGE)" ""
ifneq "$(PACKAGE)" ""
@@
-228,9
+228,6
@@
else
INSTALL_IFACES += $(HS_IFACES)
endif
INSTALL_IFACES += $(HS_IFACES)
endif
-# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
-INSTALL_LIBS += $(LIBRARY)
-
# -----------------------------------------------------------------------------
# Dependencies
# -----------------------------------------------------------------------------
# Dependencies
@@
-247,6
+244,13
@@
endif
endif # $(PACKAGE) != ""
#--------------------------------------------------------------
endif # $(PACKAGE) != ""
#--------------------------------------------------------------
+# Installation
+
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
+INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY)
+endif
+
+#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
# Build $(GHCI_LIBRARY) whenever we build $(LIBRARY)
# Building dynamically-linkable libraries for GHCi
#
# Build $(GHCI_LIBRARY) whenever we build $(LIBRARY)
@@
-264,7
+268,7
@@
ifeq "$(GhcWithInterpreter)" "YES"
GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
-ifneq "$(PACKAGE)" ""
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
INSTALL_LIBS += $(GHCI_LIBRARY)
endif
INSTALL_LIBS += $(GHCI_LIBRARY)
endif
@@
-323,7
+327,7
@@
$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
endif
$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
endif
-ifneq "$(PACKAGE)" ""
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
INSTALL_LIBS += $(DYLD_LIBRARY)
endif
INSTALL_LIBS += $(DYLD_LIBRARY)
endif