Mercurial > hg > octave-max
changeset 15273:dd794aa84232
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 | 535bb601e7db |
files | libgui/src/Makefile.am libinterp/link-deps.mk liboctave/Makefile.am liboctave/cruft/Makefile.am liboctave/cruft/link-deps.mk liboctave/cruft/ranlib/module.mk liboctave/link-deps.mk liboctave/operators/module.mk src/Makefile.am |
diffstat | 9 files changed, 44 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/Makefile.am +++ b/libgui/src/Makefile.am @@ -103,9 +103,16 @@ -I$(srcdir)/m-editor \ -I$(srcdir)/octave-adapter \ -I$(srcdir)/qtinfo \ + -I../../liboctave \ + -I../../liboctave/numeric \ + -I../../liboctave/operators \ + -I$(srcdir)/../../liboctave \ + -I$(srcdir)/../../liboctave/array \ -I$(srcdir)/../../liboctave/cruft/misc \ - -I../../liboctave \ - -I$(srcdir)/../../liboctave \ + -I$(srcdir)/../../liboctave/numeric \ + -I$(srcdir)/../../liboctave/operators \ + -I$(srcdir)/../../liboctave/system \ + -I$(srcdir)/../../liboctave/util \ -I../../libinterp \ -I../../libinterp/interp-core \ -I../../libinterp/interpfcn \
--- a/libinterp/link-deps.mk +++ b/libinterp/link-deps.mk @@ -7,7 +7,6 @@ endif LIBOCTINTERP_LINK_DEPS += \ - $(GNULIB_LINK_DEPS) \ $(GRAPHICS_LIBS) \ $(FT2_LIBS) \ $(HDF5_LIBS) \
--- 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:
--- a/liboctave/cruft/Makefile.am +++ b/liboctave/cruft/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu -octlib_LTLIBRARIES = libcruft.la +noinst_LTLIBRARIES = libcruft.la libcruft_la_SOURCES = @@ -38,34 +38,13 @@ @CRUFT_DLL_DEFS@ \ $(AM_CPPFLAGS) -include link-deps.mk - -libcruft_la_LIBADD = \ - libranlib.la \ - $(top_builddir)/libgnu/libgnu.la \ - $(LIBCRUFT_LINK_DEPS) - -# Increment these as needed and according to the rules in the libtool manual: -libcruft_current = 1 -libcruft_revision = 0 -libcruft_age = 0 - -libcruft_version_info = $(libcruft_current):$(libcruft_revision):$(libcruft_age) - -libcruft_la_LDFLAGS = \ - -version-info $(libcruft_version_info) \ - $(NO_UNDEFINED_LDFLAG) \ - @XTRA_CRUFT_SH_LDFLAGS@ \ - -bindir $(bindir) \ - $(LIBCRUFT_LINK_OPTS) - libcruft_la_DEPENDENCIES = cruft.def -noinst_LTLIBRARIES = libranlib.la +noinst_LTLIBRARIES += ranlib/libranlib.la -libranlib_la_SOURCES = +ranlib_libranlib_la_SOURCES = -libranlib_la_DEPENDENCIES = ranlib.def +ranlib_libranlib_la_DEPENDENCIES = ranlib.def octinclude_HEADERS =
deleted file mode 100644 --- a/liboctave/cruft/link-deps.mk +++ /dev/null @@ -1,23 +0,0 @@ -GNULIB_LINK_DEPS = \ - $(COPYSIGNF_LIBM)\ - $(COPYSIGN_LIBM)\ - $(FLOOR_LIBM)\ - $(GETHOSTNAME_LIB)\ - $(LIBSOCKET)\ - $(LIB_NANOSLEEP)\ - $(LIB_SELECT)\ - $(LTLIBINTL)\ - $(ROUNDF_LIBM)\ - $(ROUND_LIBM)\ - $(TRUNCF_LIBM)\ - $(TRUNC_LIBM) - -LIBCRUFT_LINK_DEPS = \ - $(GNULIB_LINK_DEPS) \ - $(LAPACK_LIBS) \ - $(BLAS_LIBS) \ - $(FLIBS) \ - $(LIBS) - -LIBCRUFT_LINK_OPTS = -
--- a/liboctave/cruft/ranlib/module.mk +++ b/liboctave/cruft/ranlib/module.mk @@ -9,7 +9,7 @@ ranlib/tstgmn.for \ ranlib/tstmid.for -libranlib_la_SOURCES += \ +ranlib_libranlib_la_SOURCES += \ ranlib/advnst.f \ ranlib/genbet.f \ ranlib/genchi.f \
--- a/liboctave/link-deps.mk +++ b/liboctave/link-deps.mk @@ -1,7 +1,19 @@ -include $(top_srcdir)/liboctave/cruft/link-deps.mk +GNULIB_LINK_DEPS = \ + $(COPYSIGNF_LIBM)\ + $(COPYSIGN_LIBM)\ + $(FLOOR_LIBM)\ + $(GETHOSTNAME_LIB)\ + $(LIBSOCKET)\ + $(LIB_NANOSLEEP)\ + $(LIB_SELECT)\ + $(LTLIBINTL)\ + $(ROUNDF_LIBM)\ + $(ROUND_LIBM)\ + $(TRUNCF_LIBM)\ + $(TRUNC_LIBM) LIBOCTAVE_LINK_DEPS = \ - $(GNULIB_LINK_DEPS) \ + $(GNULIB_LINK_DEPS) \ $(SPARSE_XLIBS) \ $(ARPACK_LIBS) \ $(QRUPDATE_LIBS) \ @@ -14,6 +26,7 @@ $(REGEX_LIBS) \ $(DL_LIBS) \ $(PTHREAD_LIBS) \ + $(FLIBS) \ $(LIBS) LIBOCTAVE_LINK_OPTS = \ @@ -21,8 +34,3 @@ $(ARPACK_LDFLAGS) \ $(QRUPDATE_LDFLAGS) \ $(FFTW_XLDFLAGS) - -if AMCOND_LINK_ALL_DEPS - LIBOCTAVE_LINK_DEPS += $(LIBCRUFT_LINK_DEPS) - LIBOCTAVE_LINK_OPTS += $(LIBCRUFT_LINK_OPTS) -endif
--- a/liboctave/operators/module.mk +++ b/liboctave/operators/module.mk @@ -46,13 +46,13 @@ ## Special rules for sources which must be built before rest of compilation. $(VX_OP_INC) $(VX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/vx-ops - (cd operators; $(AWK) -f ../$(OP_SRCDIR)/mk-ops.awk prefix=vx ../$(OP_SRCDIR)/vx-ops) + (cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=vx $(OP_SRCDIR)/vx-ops) $(MX_OP_INC) $(MX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops - (cd operators; $(AWK) -f ../$(OP_SRCDIR)/mk-ops.awk prefix=mx ../$(OP_SRCDIR)/mx-ops) + (cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx $(OP_SRCDIR)/mx-ops) $(SMX_OP_INC) $(SMX_OP_SRC) : $(OP_SRCDIR)/sparse-mk-ops.awk operators/sparse-mx-ops - (cd operators; $(AWK) -f ../$(OP_SRCDIR)/sparse-mk-ops.awk prefix=smx ../$(OP_SRCDIR)/sparse-mx-ops) + (cd operators; $(AWK) -f $(OP_SRCDIR)/sparse-mk-ops.awk prefix=smx $(OP_SRCDIR)/sparse-mx-ops) operators/mx-ops.h : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(OP_SRCDIR)/mx-ops > $@-t
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,8 +22,11 @@ ## Search local directories before those specified by the user. AM_CPPFLAGS = \ - -I$(srcdir)/../libcruft/misc \ -I$(srcdir)/../liboctave \ + -I$(srcdir)/../liboctave/array \ + -I$(srcdir)/../liboctave/cruft/misc \ + -I$(srcdir)/../liboctave/numeric \ + -I$(srcdir)/../liboctave/util \ -I$(srcdir)/../libinterp \ -I$(top_builddir)/libinterp/interpfcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu