# HG changeset patch
# User jwe
# Date 943067145 0
# Node ID fac05a83b4c5b99abaca3f2f6ab70de2844ffe37
# Parent  9db3ff0b69134589126f19bb126e801ef031055e
[project @ 1999-11-20 03:05:42 by jwe]

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* interpreter/Makefile.in (%.texi : %.txi): Suppress command echo.
+
 1999-10-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* interpreter/Makefile.in (dist): Remove .texi files first, so
diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -76,10 +76,11 @@
 	$(MAKE) -C $(dir $@) $(notdir $@)
 
 %.texi : %.txi
-	./munge-texi \
+	@echo making $@ from $<
+	@./munge-texi \
 	  -d $(TOPDIR)/src/DOCSTRINGS \
 	  -d $(TOPDIR)/scripts/DOCSTRINGS < $< > $@.t
-	mv $@.t $@
+	@mv $@.t $@
 
 octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
 	-makeinfo -I$(srcdir) -I$(srcdir)/.. $<
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,7 @@
 1999-11-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makefile.in (DOCSTRINGS): Don't echo $(ALL_M_FILES).
+
 	* strings/blanks.m: Texinfoize doc string.
 	* strings/strcat.m: Ditto.
 	* strings/str2mat.m: Ditto.
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -49,7 +49,6 @@
 .PHONY: $(SUBDIRS)
 
 DOCSTRINGS: gethelp mkdoc $(ALL_M_FILES)
-	echo $(ALL_M_FILES)
 	$(srcdir)/mkdoc $(srcdir) > $@.t
 	mv $@.t $@
 
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,13 @@
 1999-11-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* defun-int.h (DEFUN_DLD_INTERNAL): New macro.
+	* defun-dld.h [MAKE_BUILTINS] (DEFUN_DLD): Simply expand to
+	DEFUN_DLD_INTERNAL.
+	* mkbuiltins: Generate code to define DEFUN_DLD_INTERNAL.
+	* mkgendoc: Likewise.
+
 	* Makefile.in (gendoc.o): Don't optimize when creating gendoc.
+	(%.dc : %.cc): Delete rule.
 
 	* pt-decl.cc (Vdefault_global_variable_value): Texinofize doc string.
 	* variables.cc (Fclear, Fdocument, Fexist, Fis_global, Fwho): Ditto.
@@ -13,7 +20,6 @@
 	* mappers.cc: (Fisalnum, Fisalpha, Fisascii, Fiscntrl, Fisdigit,
 	Fisgraph, Fislower, Fisprint, Fispunct, Fisspace, Fisupper,
 	Fisxdigit, Ftoascii, Ftolower, Ftoupper): Ditto.
-	
 
 1999-11-18  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -27,12 +27,6 @@
 	  | $(srcdir)/mkdefs > $@.t
 	@mv $@.t $@
 
-%.dc : %.cc
-	@echo making $@ from $<
-	@$(CXXCPP) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) -DMAKE_DOC $< \
-	  | $(srcdir)/mkdocs > $@.t
-	@mv $@.t $@
-
 # How to make a .oct file from a .o file:
 
 ifeq ($(OCTAVE_LITE), true)
diff --git a/src/defun-dld.h b/src/defun-dld.h
--- a/src/defun-dld.h
+++ b/src/defun-dld.h
@@ -41,12 +41,8 @@
 
 #if defined (MAKE_BUILTINS)
 
-#if ! (defined (OCTAVE_LITE) && defined (WITH_DYNAMIC_LINKING))
-
 #define DEFUN_DLD(name, args_name, nargout_name, doc) \
-  DEFUN_INTERNAL (name, args_name, nargout_name, 0, doc)
-
-#endif
+  DEFUN_DLD_INTERNAL (name, args_name, nargout_name, 0, doc)
 
 #else
 
diff --git a/src/defun-int.h b/src/defun-int.h
--- a/src/defun-int.h
+++ b/src/defun-int.h
@@ -89,13 +89,22 @@
 
 // Generate code to install name in the symbol table.  The script
 // mkdefs will create a .def file for every .cc file that uses DEFUN,
-// DEFUN_TEXT, or DEFUN_DLD.
+// or DEFUN_TEXT.
 
 #define DEFUN_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
   BEGIN_INSTALL_BUILTIN \
     XDEFUN_INTERNAL (name, args_name, nargout_name, is_text_fcn, doc) \
   END_INSTALL_BUILTIN
 
+// Generate code to install name in the symbol table.  The script
+// mkdefs will create a .def file for every .cc file that uses
+// DEFUN_DLD.
+
+#define DEFUN_DLD_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
+  BEGIN_INSTALL_BUILTIN \
+    XDEFUN_DLD_INTERNAL (name, args_name, nargout_name, is_text_fcn, doc) \
+  END_INSTALL_BUILTIN
+
 // Generate code for making another name for an existing function.
 
 #define DEFALIAS_INTERNAL(alias, name) \
diff --git a/src/mkbuiltins b/src/mkbuiltins
--- a/src/mkbuiltins
+++ b/src/mkbuiltins
@@ -29,6 +29,13 @@
 #include "oct-obj.h"
 #include "variables.h"
 
+#if defined (OCTAVE_LITE) && defined (WITH_DYNAMIC_LINKING)
+#define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc)
+#else
+#define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
+  XDEFUN_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc)
+#endif
+
 #define XDEFUN_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
   extern DECLARE_FUN (name, args_name, nargout_name); \
     install_builtin_function (F ## name, #name, doc, is_text_fcn); \
diff --git a/src/mkgendoc b/src/mkgendoc
--- a/src/mkgendoc
+++ b/src/mkgendoc
@@ -13,11 +13,14 @@
 fi
 
 cat << \EOF
-// DO NOT EDIT!  Generated automatically by mkbuiltins.
+// DO NOT EDIT!  Generated automatically by mkgendoc
 
 #include <iostream.h>
 #include <string>
 
+#define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
+  print_doc_string (#name, doc);
+
 #define XDEFUN_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
   print_doc_string (#name, doc);