[Octave-patch-tracker] [patch #10278] GSoC 2022: add support for sparse computations in ode15{i, s} using Octave classes , making dependency on KLU optional.

[Markus Mützel]

Follow-up Comment #26, patch #10278 (project octave):

These changes to `config-module.awk` will hopefully take care of including the
new file in the tarball:

diff -r 96ed8d1d0c59 libinterp/dldfcn/config-module.awk
--- a/libinterp/dldfcn/config-module.awk        Sat Mar 04 00:59:48 2023 -0500
+++ b/libinterp/dldfcn/config-module.awk        Tue Mar 07 16:42:35 2023 +0100
@@ -45,15 +45,14 @@
   libraries[nfiles] = $4;
 } END {
   sep = " \\\n";
-  print "DLDFCN_SRC = \\";
+  printf ("DLDFCN_SRC =");
   for (i = 1; i <= nfiles; i++) {
-    if (i == nfiles)
-      sep = "\n";
-    printf ("  %%reldir%%/%s%s", files[i], sep);
+    split (files[i], src_files, " ");
+    printf ("%s  %%reldir%%/%s", sep, src_files[1]);
   }
   print "";
+  print "";
 
-  sep = " \\\n";
   print "DLDFCN_LIBS = $(DLDFCN_SRC:.cc=.la)";
   print "";
   print "octlib_LTLIBRARIES += $(DLDFCN_LIBS)";
@@ -65,11 +64,14 @@
   print "\t$(AM_V_GEN)$(INSTALL_PROGRAM) %reldir%/.libs/$(shell $(SED) -n -e
\"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
 
   for (i = 1; i <= nfiles; i++) {
-    basename = files[i];
+    split (files[i], src_files, " ");
+    basename = src_files[1];
     sub (/\.cc$/, "", basename);
     print "";
-    printf ("%%canon_reldir%%_%s_la_SOURCES = %%reldir%%/%s\n",
-            basename, files[i]);
+    printf ("%%canon_reldir%%_%s_la_SOURCES =", basename);
+    for (j in src_files)
+      printf (" %%reldir%%/%s", src_files[j]);
+    print "";
     if (cppflags[i])
       {
         printf ("%%canon_reldir%%_%s_la_CPPFLAGS =
$(libinterp_liboctinterp_la_CPPFLAGS) %s\n",
@@ -90,7 +92,13 @@
   print "";
   print "DLDFCN_OCT_FILES = $(DLDFCN_LIBS:.la=.oct)";
   print "";
-  print "DLDFCN_DEFUN_FILES = $(DLDFCN_SRC)";
+  printf ("DLDFCN_DEFUN_FILES =");
+  for (i = 1; i <= nfiles; i++) {
+    split (files[i], src_files, " ");
+    for (j in src_files)
+      printf ("%s  %%reldir%%/%s", sep, src_files[j]);
+  }
+  print "";
   print "";
   print "DLDFCN_PKG_ADD_FILE = %reldir%/PKG_ADD";
   print "";


Still untested.



    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/patch/?10278>

_______________________________________________
Message sent via Savannah
https://savannah.gnu.org/