# HG changeset patch
# User jwe
# Date 1029433135 0
# Node ID b908aaa4080a2d9f93243799c797f196360ebfb5
# Parent  9678c5526190efed5adcbd56a2eb668767bf649f
[project @ 2002-08-15 17:38:54 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2002-08-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makefile.in (DLD_DEF_FILES): New macro.
+	(DEF_5): Delete.
+	(DEF_4): Now only includes $(SOURCES).
+	(DEF_FILES): Append $(DLD_DEF_FILES) here.
+	(stamp-oct-links): Pass $(DLD_DEF_FILES) to mk-oct-links instead
+	of a list of source files.
+	* mk-oct-links: Work on .df files instead of .cc files.
+
 	* parse.y (case_list): Allow it to be empty.
 
 	* ov.cc, ov.h (octave_value::int_vector_value): New function.
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -172,12 +172,13 @@
 
 DEFUN_PATTERN = "^[ \t]*DEFU(N|N_DLD|N_TEXT|N_MAPPER)[ \t]*\\("
 
-DEF_5 := $(SOURCES) $(DLD_SRC)
-DEF_4 := $(addprefix $(srcdir)/, $(DEF_5))
+DLD_DEF_FILES := $(patsubst %.cc, %.df, $(DLD_XSRC))
+
+DEF_4 := $(addprefix $(srcdir)/, $(SOURCES))
 DEF_3 := $(notdir $(shell egrep -l $(DEFUN_PATTERN) $(DEF_4)))
 DEF_2 := $(patsubst %.y, %.df, $(DEF_3))
 DEF_1 := $(patsubst %.l, %.df, $(DEF_2))
-DEF_FILES := $(patsubst %.cc, %.df, $(DEF_1))
+DEF_FILES := $(patsubst %.cc, %.df, $(DEF_1)) $(DLD_DEF_FILES)
 
 DEFVAR_PATTERN = "^[ \t]*DEF(VAR|CONS(T|TX))[ \t]*\\("
 
@@ -256,7 +257,7 @@
 
 stamp-oct-links: $(OCT_FILES)
 	if [ -n "$(OCT_FILES)" ]; then \
-	  $(srcdir)/mk-oct-links . $(addprefix $(srcdir)/, $(DLD_SRC)); \
+	  $(srcdir)/mk-oct-links . $(DLD_DEF_FILES); \
 	fi
 	touch stamp-oct-links
 
diff --git a/src/mk-oct-links b/src/mk-oct-links
--- a/src/mk-oct-links
+++ b/src/mk-oct-links
@@ -7,7 +7,8 @@
 
 # The first non-option arg is taken as the directory where the .oct
 # files are installed.  The remaining arguments should be the list of
-# source files that were used to create the .oct files.
+# .df files corresponding to the source files that were used to
+# create the .oct files.
 
 print_only=false
 if [ $1 = "-p" ]; then
@@ -19,9 +20,9 @@
 shift
 
 for f in "$@"; do
-  base=`basename $f | sed 's/\.cc$//'`
-  fcns=`grep '^ *DEFUN_DLD' $f |\
-        sed -e 's/DEFUN_DLD *( *//' -e 's/ *,.*$//' |\
+  base=`basename $f | sed 's/\.df$//'`
+  fcns=`grep '^ *XDEFUN_DLD_INTERNAL' $f |\
+        sed -e 's/XDEFUN_DLD_INTERNAL *( *//' -e 's/ *,.*$//' |\
         sort -u`
   if [ -n "$fcns" ]; then
     for n in $fcns; do