[svn-upgrade] Integrating new upstream version, ion3 (20080103)

[ion3.git] / build / rules.mk

diff --git a/build/rules.mk b/build/rules.mk
index 3f8a42d0cfff40963a6d6e5dad16a20655069753..488a02af209349208f13db7ab3c5b1025a8e0d30 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -40,11 +40,11 @@ depend: subdirs-depend _depend
 install: subdirs-install _install
 
 
+ifdef MAKE_EXPORTS
+
 # Exports
 ######################################
 
-ifdef MAKE_EXPORTS
-
 EXPORTS_C = exports.c
 EXPORTS_H = exports.h
 
@@ -56,14 +56,28 @@ _exports: $(EXPORTS_C)
 
 $(EXPORTS_H): $(EXPORTS_C)
 
-$(EXPORTS_C): $(SOURCES)
+$(EXPORTS_C): $(SOURCES) $(MKEXPORTS_EXTRA_DEPS)
        $(MKEXPORTS) -module $(MAKE_EXPORTS) -o $(EXPORTS_C) -h $(EXPORTS_H) \
        $(SOURCES) $(MKEXPORTS_EXTRAS)
 
+# Exports documentation
+######################################
+
+EXPORTS_DOC = exports.tex
+
+TO_CLEAN := $(TO_CLEAN) $(EXPORTS_DOC)
+
+_exports_doc: $(EXPORTS_DOC)
+
+$(EXPORTS_DOC): $(SOURCES) $(LUA_SOURCES) $(MKEXPORTS_EXTRA_DEPS)
+       $(MKEXPORTS) -mkdoc -module $(MAKE_EXPORTS) -o $(EXPORTS_DOC) \
+       $(SOURCES) $(LUA_SOURCES) $(MKEXPORTS_EXTRAS)
+
 else # !MAKE_EXPORTS
 
 EXPORTS_C = 
 EXPORTS_H = 
+EXPORTS_DOC =
 
 endif # !MAKE_EXPORTS
 
@@ -89,7 +103,7 @@ $(MODULE).so: $(OBJS) $(EXT_OBJS)
 
 module_install: module_stub_install
        $(INSTALLDIR) $(MODULEDIR)
-       $(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
+       $(INSTALLBIN) $(MODULE).so $(MODULEDIR)
 
 else # PRELOAD_MODULES
 
@@ -202,3 +216,9 @@ TO_CLEAN += potfiles_c potfiles_lua
 _potfiles:
        echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c
        echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua
+
+# Defaults
+######################################
+
+INSTALL_STRIP ?= -s
+INSTALLBIN ?= $(INSTALL) $(INSTALL_STRIP) -m $(BIN_MODE)