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-02 14:26:55 by simonmar]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
be54753
..
7397e63
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.46 2005/02/08 10:21:36 simonmar Exp $
+# $Id: package.mk,v 1.48 2005/02/10 13:38:35 simonmar 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
@@
-244,6
+241,15
@@
ifeq "$(STANDALONE_PACKAGE)" "NO"
SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
endif
SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
endif
+endif # $(PACKAGE) != ""
+
+#--------------------------------------------------------------
+# Installation
+
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
+INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY)
+endif
+
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
@@
-261,7
+267,10
@@
ifeq "$(way)" ""
ifeq "$(GhcWithInterpreter)" "YES"
GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
ifeq "$(GhcWithInterpreter)" "YES"
GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
+
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
INSTALL_LIBS += $(GHCI_LIBRARY)
INSTALL_LIBS += $(GHCI_LIBRARY)
+endif
CLEAN_FILES += $(GHCI_LIBRARY)
CLEAN_FILES += $(GHCI_LIBRARY)
@@
-308,7
+317,7
@@
DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
# Note: I'm not yet sure about this, but I think it will be convenient for
# users not to have to set up DYLD_LIBRARY_PATH to point to the GHC
# library dir. -- Wolfgang
# Note: I'm not yet sure about this, but I think it will be convenient for
# users not to have to set up DYLD_LIBRARY_PATH to point to the GHC
# library dir. -- Wolfgang
-
+
$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
else
$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
else
@@
-318,17
+327,22
@@
$(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
endif
$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
endif
+ifneq "$(PACKAGE)" ""
INSTALL_LIBS += $(DYLD_LIBRARY)
INSTALL_LIBS += $(DYLD_LIBRARY)
+endif
+
CLEAN_FILES += $(DYLD_LIBRARY)
all :: $(DYLD_LIBRARY)
CLEAN_FILES += $(DYLD_LIBRARY)
all :: $(DYLD_LIBRARY)
+endif # $(GhcBuildDylibs) == "YES"
-endif
+endif # $(LIBRARY) /= ""
# -----------------------------------------------------------------------------
# Doc building with Haddock
# -----------------------------------------------------------------------------
# Doc building with Haddock
+ifneq "$(PACKAGE)" ""
ifneq "$(NO_HADDOCK_DOCS)" "YES"
HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
ifneq "$(NO_HADDOCK_DOCS)" "YES"
HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
@@
-382,9
+396,7
@@
install-docs :: $(HTML_DOC)
endif # HS_PPS
endif # NO_HADDOCK_DOCS
endif # HS_PPS
endif # NO_HADDOCK_DOCS
+endif # $(PACKAGE) /= ""
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-endif # $(LIBRARY) /= ""
-endif # $(PACKAGE) /= ""
-