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.

include $(top_srcdir)/liboctave/link-deps.mk

if AMCOND_ENABLE_DYNAMIC_LINKING
  LIBOCTINTERP_LINK_DEPS =
else
  LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS)
endif

LIBOCTINTERP_LINK_DEPS += \
  $(GRAPHICS_LIBS) \
  $(FT2_LIBS) \
  $(HDF5_LIBS) \
  $(Z_LIBS) \
  $(FFTW_XLIBS) \
  $(REGEX_LIBS) \
  $(OPENGL_LIBS) \
  $(X11_LIBS) \
  $(CARBON_LIBS) \
  $(LLVM_LIBS) \
  $(LAPACK_LIBS)

LIBOCTINTERP_LINK_OPTS = \
  $(GRAPHICS_LDFLAGS) \
  $(FT2_LDFLAGS) \
  $(HDF5_LDFLAGS) \
  $(Z_LDFLAGS) \
  $(REGEX_LDFLAGS) \
  $(FFTW_XLDFLAGS) \
  $(LLVM_LDFLAGS)

OCT_LINK_DEPS =

OCT_LINK_OPTS = $(LDFLAGS)

if AMCOND_LINK_ALL_DEPS
  LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS)
  LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS)

  OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS)
  OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS)

  OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
  OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
endif