Re: gnulib and automake

[John W. Eaton]

On 12-Nov-2009, John W. Eaton wrote:

| On 12-Nov-2009, Michael Goffioul wrote:
| 
| | I just tried to recompile octave with MSVC using the new automake/libtool
| | framework and the first thing I came across is the drop of mkf77def script
| | in libcruft. Any chance to get this functionality back into the build 
system?
| 
| Yes.
| 
| The file libcruft/mkf22def.in still exists, so I guess we just need a
| few rules to be added into the libcruft/Makefile.am file.

Do the following changes work for you?  If so, I'll commit them.

Thanks,

jwe

# HG changeset patch
# User John W. Eaton <address@hidden>
# Date 1258068399 18000
# Node ID dd9e9bf3a9aa293dfe8477ebe55bbb20c66c25d2
# Parent  4ea4eef3d8689422957d0959fab245898c0845de
restore rules to create libcruft/cruft.def

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-12  John W. Eaton  <address@hidden>
+
+       * configure.ac (AC_CONFIG_FILES): Also generate libcruft/mkf77def.
+
 2009-11-11  John W. Eaton  <address@hidden>
 
        * acinclude.m4 (OCTAVE_IEEE754_DATA_FORMAT): Fail if IEEE 754
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2165,6 +2165,7 @@
   gnulib/po/Makefile.in
   gnulib/tests/Makefile
   libcruft/Makefile
+  libcruft/mkf77def
   liboctave/Makefile
   scripts/Makefile
   src/Makefile
diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  John W. Eaton  <address@hidden>
+
+       * Makefile.am: Restore rules for building cruft.def.
+       * mkf77def.in: Use @VAR@ instead of %VAR% substitutions.
+       Process list of files instead of working as a filter.
+
 2009-11-10  John W. Eaton  <address@hidden>
 
        * blas, lapack: Remove directories and all files.
diff --git a/libcruft/Makefile.am b/libcruft/Makefile.am
--- a/libcruft/Makefile.am
+++ b/libcruft/Makefile.am
@@ -52,3 +52,10 @@
 include slatec-err/module.mk
 include slatec-fn/module.mk
 include villad/module.mk
+
+cruft.def: $(libcruft_la_SOURCES) $(TOPDIR)/libcruft/mkf77def
+       @chmod a+rx mkf77def
+       @./mkf77def < $(addprefix $(srcdir)/, $(libcruft_la_SOURCES)) > 
address@hidden
+       @mv address@hidden $@
+
+libcruft.la: cruft.def
diff --git a/libcruft/mkf77def.in b/libcruft/mkf77def.in
old mode 100644
new mode 100755
--- a/libcruft/mkf77def.in
+++ b/libcruft/mkf77def.in
@@ -21,9 +21,9 @@
 SED=${SED:-'sed'}
 AWK=${AWK:-'awk'}
 
-F77_TOLOWER=%F77_APPEND_UNDERSCORE%
-F77_APPEND_UNDERSCORE=%F77_APPEND_UNDERSCORE%
-F77_APPEND_EXTRA_UNDERSCORE=%F77_APPEND_EXTRA_UNDERSCORE%
+F77_TOLOWER="@F77_APPEND_UNDERSCORE@"
+F77_APPEND_UNDERSCORE="@F77_APPEND_UNDERSCORE@"
+F77_APPEND_EXTRA_UNDERSCORE="@F77_APPEND_EXTRA_UNDERSCORE@"
 
 if $F77_TOLOWER; then
   case_cmd="tolower";
@@ -43,4 +43,8 @@
   awkcmd="$AWK '{ printf (\"%s%s\n\", tolower (\$0), \"$uscore\"); }'"
 fi
 
-$SED -n -e 'y/ABCDEFGHIJLKMNOPQRSTUVWXYZ/abcdefghijlkmnopqrstuvwxyz/; s/^\(    
  \|    \)[     ]*\(.*function\|subroutine\|entry\)[    ]*\([^  (]*\).*$/\3/p' 
| eval $awkcmd
+echo EXPORTS
+for arg
+do
+  $SED -n -e 'y/ABCDEFGHIJLKMNOPQRSTUVWXYZ/abcdefghijlkmnopqrstuvwxyz/; s/^\(  
    \|  \)[     ]*\(.*function\|subroutine\|entry\)[    ]*\([^  (]*\).*$/\3/p' 
"$arg" | eval $awkcmd
+done