Mercurial > octave-nkf

comparison libgui/src/Makefile.am @ 15272:dd794aa84232

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John W. Eaton <jwe@octave.org>
date Sat, 01 Sep 2012 10:46:45 -0400
parents 648dabbb4c6b
children 2b3eaec99a38
comparison
equal deleted inserted replaced
15271:648dabbb4c6b 15272:dd794aa84232
101 -I$(QT_INCDIR)/QtNetwork \ 101 -I$(QT_INCDIR)/QtNetwork \
102 -I$(srcdir)/../qterminal/libqterminal \ 102 -I$(srcdir)/../qterminal/libqterminal \
103 -I$(srcdir)/m-editor \ 103 -I$(srcdir)/m-editor \
104 -I$(srcdir)/octave-adapter \ 104 -I$(srcdir)/octave-adapter \
105 -I$(srcdir)/qtinfo \ 105 -I$(srcdir)/qtinfo \
106 -I../../liboctave \
107 -I../../liboctave/numeric \
108 -I../../liboctave/operators \
109 -I$(srcdir)/../../liboctave \
110 -I$(srcdir)/../../liboctave/array \
106 -I$(srcdir)/../../liboctave/cruft/misc \ 111 -I$(srcdir)/../../liboctave/cruft/misc \
107 -I../../liboctave \ 112 -I$(srcdir)/../../liboctave/numeric \
108 -I$(srcdir)/../../liboctave \ 113 -I$(srcdir)/../../liboctave/operators \
114 -I$(srcdir)/../../liboctave/system \
115 -I$(srcdir)/../../liboctave/util \
109 -I../../libinterp \ 116 -I../../libinterp \
110 -I../../libinterp/interp-core \ 117 -I../../libinterp/interp-core \
111 -I../../libinterp/interpfcn \ 118 -I../../libinterp/interpfcn \
112 -I../../libinterp/parse-tree \ 119 -I../../libinterp/parse-tree \
113 -I$(srcdir)/../../libinterp \ 120 -I$(srcdir)/../../libinterp \