copy from liboctave/Makefile.am
copy to liboctave/module.mk
--- a/liboctave/Makefile.am
+++ b/liboctave/module.mk
@@ -18,93 +18,83 @@
 # along with Octave; see the file COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-include $(top_srcdir)/build-aux/common.mk
-
 ## Search local directories before those specified by the user.
-AM_CPPFLAGS = \
-  -I$(srcdir)/array \
-  -I$(srcdir)/cruft/misc \
-  -Inumeric -I$(srcdir)/numeric \
-  -Ioperators -I$(srcdir)/operators \
-  -I$(srcdir)/system \
-  -I$(srcdir)/util \
+liboctave_liboctave_la_CPPFLAGS = \
+  @OCTAVE_DLL_DEFS@ \
+  @CRUFT_DLL_DEFS@ \
+  -I$(srcdir)/liboctave/array \
+  -I$(srcdir)/liboctave/cruft/misc \
+  -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
+  -Iliboctave/operators -I$(srcdir)/liboctave/operators \
+  -I$(srcdir)/liboctave/system \
+  -I$(srcdir)/liboctave/util \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
-AM_CFLAGS += $(WARN_CFLAGS)
-
-AM_CXXFLAGS += $(WARN_CXXFLAGS)
+liboctave_liboctave_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
 
-octlib_LTLIBRARIES = liboctave.la
+liboctave_liboctave_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
 
-EXTRA_DIST =
-
-DISTCLEANFILES =
+octlib_LTLIBRARIES += liboctave/liboctave.la
 
 BUILT_INCS = \
-  operators/mx-ops.h \
-  $(OPT_INC) \
+  liboctave/operators/mx-ops.h \
+  $(LIBOCTAVE_OPT_INC) \
   $(MX_OP_INC) \
   $(VX_OP_INC) \
   $(SMX_OP_INC)
 
-BUILT_SOURCES = $(BUILT_INCS)
+BUILT_SOURCES += $(BUILT_INCS)
 
-octinclude_HEADERS = \
+octinclude_HEADERS += \
   $(ARRAY_INC) \
   $(CRUFT_INC) \
   $(NUMERIC_INC) \
-  $(OPERATORS_INC) \
+  $(LIBOCTAVE_OPERATORS_INC) \
   $(SYSTEM_INC) \
   $(UTIL_INC) \
   $(OTHER_INC) \
-  $(TEMPLATE_SRC)
+  $(LIBOCTAVE_TEMPLATE_SRC)
 
-nodist_octinclude_HEADERS = \
+nodist_octinclude_HEADERS += \
   $(BUILT_INCS)
 
-noinst_LTLIBRARIES =
-
 ## C++ files that are #included, not compiled
 OTHER_INC =
 
 ## C++ files with templates that are #included, not compiled
-TEMPLATE_SRC =
+LIBOCTAVE_TEMPLATE_SRC =
 
 ## A list of all files that could include tests
 
-liboctave_la_LIBADD =
+liboctave_liboctave_la_LIBADD =
 
-include array/module.mk
-include cruft/module.mk
-include numeric/module.mk
-include operators/module.mk
-include system/module.mk
-include util/module.mk
+include liboctave/array/module.mk
+include liboctave/cruft/module.mk
+include liboctave/numeric/module.mk
+include liboctave/operators/module.mk
+include liboctave/system/module.mk
+include liboctave/util/module.mk
 
 ## liboctave merely collects a bunch of compiled convenience libraries.
 ## It has no source code itself.
-liboctave_la_SOURCES =
-
-liboctave_la_CPPFLAGS = @OCTAVE_DLL_DEFS@ @CRUFT_DLL_DEFS@ $(AM_CPPFLAGS)
-
-include link-deps.mk
+liboctave_liboctave_la_SOURCES =
 
 # Dummy C++ source to force C++ linking.
-nodist_EXTRA_liboctave_la_SOURCES = dummy.cc
+nodist_EXTRA_liboctave_liboctave_la_SOURCES = dummy.cc
 
-liboctave_la_LIBADD += \
+liboctave_liboctave_la_LIBADD += \
   $(top_builddir)/libgnu/libgnu.la \
   $(LIBOCTAVE_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:
-liboctave_current = 3
-liboctave_revision = 0
-liboctave_age = 0
+liboctave_liboctave_current = 3
+liboctave_liboctave_revision = 0
+liboctave_liboctave_age = 0
 
-liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
+liboctave_liboctave_version_info = $(liboctave_liboctave_current):$(liboctave_liboctave_revision):$(liboctave_age)
 
-liboctave_la_LDFLAGS = \
-  -version-info $(liboctave_version_info) \
+liboctave_liboctave_la_LDFLAGS = \
+  -version-info $(liboctave_liboctave_version_info) \
   $(NO_UNDEFINED_LDFLAG) \
   @XTRA_CRUFT_SH_LDFLAGS@ \
   -bindir $(bindir) \
@@ -113,21 +103,21 @@
 ## Rules to build test files
 
 LIBOCTAVE_TST_SRC = \
-  $(array_libarray_la_SOURCES) \
-  $(numeric_libnumeric_la_SOURCES) \
-  $(system_libsystem_la_SOURCES) \
-  $(util_libutil_la_SOURCES) \
+  $(liboctave_array_libarray_la_SOURCES) \
+  $(liboctave_numeric_libnumeric_la_SOURCES) \
+  $(liboctave_system_libsystem_la_SOURCES) \
+  $(liboctave_util_libutil_la_SOURCES) \
   $(TEMPLATE_SRC)
 
-TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(LIBOCTAVE_TST_SRC))
+LIBOCTAVE_TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(LIBOCTAVE_TST_SRC))
 
-TST_FILES := $(addsuffix -tst,$(TST_FILES_SRC))
+LIBOCTAVE_TST_FILES := $(addsuffix -tst,$(LIBOCTAVE_TST_FILES_SRC))
 
 liboctavetestsdir := $(octtestsdir)/liboctave
 
-nobase_liboctavetests_DATA = $(TST_FILES)
+nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES)
 
 DISTCLEANFILES += \
   $(BUILT_INCS) \
-  $(TST_FILES)
+  $(LIBOCTAVE_TST_FILES)