additional changes for merger of libcruft with liboctave * libgui/src/Makefile.am (AM_CPPFLAGS): Include -I../../liboctave/numeric, -I../../liboctave/operators, --I$(srcdir)/../../liboctave/array, --I$(srcdir)/../../liboctave/numeric, --I$(srcdir)/../../liboctave/operators, --I$(srcdir)/../../liboctave/system, and -I$(srcdir)/../../liboctave/util in the list. * libinterp/link-deps.mk (LIBOCTINTERP_LINK_DEPS): Delete $(GNULIB_LINK_DEPS) from the list. * liboctave/Makefile.am (liboctae_la_LIBADD): Include cruft/ranlib/libranlib.la and ../libgnu/libgnu.la in the list. * liboctave/cruft/link-deps.mk: Delete. * liboctave/cruft/Makefile.am (noinst_LTLIBRARIES): Rename from octlib_LTLIBRARIES. Don't include link-deps.mk. (libcruft_la_LIBADD, libcruft_current, libcruft_revision, libcruft_age, libcruft_la_LDFLAGS): Delete. Build libranlib.la in ranlib subdirectory. * module.mk (ranlib_libranlib_la_SOURCES): Rename from libranlib_la_SOURCES. * liboctave/link-deps.mk: Don't include $(top_srcdir)/liboctave/cruft/link-deps.mk. (GNULIB_LINK_DEPS): Move definition here from liboctave/cruft/link-deps.mk. (LIBOCTAVE_LINK_DEPS): Include $(FLIBS) in the list. Don't add $(LIBCRUFT_LINK_DEPS) to LIBOCTAVE_LINK_DEPS. Don't add $(LIBCRUFT_LINK_OPTS) to LIBOCTAVE_LINK_OPTS. * liboctave/operators/module.mk: Use correct names for mk-ops.awk script and mx-ops, vx-ops, and sparse-mx-ops files. * src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../liboctave/array, -I$(srcdir)/../liboctave/numeric, and -I$(srcdir)/../liboctave/util in the list. Include -I$(srcdir)/../liboctave/cruft/misc in the list, not -I$(srcdir)/../libcruft/misc.

--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -28,8 +28,8 @@
 
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
+  -I$(srcdir)/array \
   -I$(srcdir)/cruft/misc \
-  -I$(srcdir)/array \
   -Inumeric -I$(srcdir)/numeric \
   -Ioperators -I$(srcdir)/operators \
   -I$(srcdir)/system \
@@ -94,11 +94,13 @@
 
 liboctave_la_LIBADD = \
   array/libarray.la \
-	cruft/libcruft.la \
-	numeric/libnumeric.la \
-	operators/liboperators.la \
-	system/libsystem.la \
-	util/libutil.la \
+  cruft/libcruft.la \
+  cruft/ranlib/libranlib.la \
+  numeric/libnumeric.la \
+  operators/liboperators.la \
+  system/libsystem.la \
+  util/libutil.la \
+  ../libgnu/libgnu.la \
   $(LIBOCTAVE_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual: