octave-nkf: liboctave/operators/module.mk annotate

annotate liboctave/operators/module.mk @ 15272: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

rev	line source
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	1 EXTRA_DIST += \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	2 operators/module.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	3 operators/config-ops.sh \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	4 operators/mk-ops.awk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	5 operators/mx-op-inc.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	6 operators/mx-op-src.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	7 operators/mx-ops \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	8 operators/smx-op-inc.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	9 operators/smx-op-src.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	10 operators/sparse-mk-ops.awk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	11 operators/sparse-mx-ops \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	12 operators/vx-op-inc.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	13 operators/vx-op-src.mk \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	14 operators/vx-ops
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	15
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	16 include operators/vx-op-inc.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	17 include operators/mx-op-inc.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	18 include operators/smx-op-inc.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	19
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	20 include operators/vx-op-src.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	21 include operators/mx-op-src.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	22 include operators/smx-op-src.mk
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	23
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	24 BUILT_LIBOPERATORS_SOURCES = \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	25 $(MX_OP_SRC) \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	26 $(VX_OP_SRC) \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	27 $(SMX_OP_SRC)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	28
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	29 OPERATORS_INC = \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	30 operators/mx-base.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	31 operators/mx-defs.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	32 operators/mx-ext.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	33 operators/mx-op-decl.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	34 operators/mx-op-defs.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	35 operators/Sparse-diag-op-defs.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	36 operators/Sparse-op-defs.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	37 operators/Sparse-perm-op-defs.h
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	38
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	39 ## There are no distributed source files in this directory
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	40 OPERATORS_SRC =
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	41
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	42 OTHER_INC += \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	43 operators/mx-inlines.cc
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	44
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	45 OP_SRCDIR = $(srcdir)/operators
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	46
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	47 ## Special rules for sources which must be built before rest of compilation.
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	48 $(VX_OP_INC) $(VX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/vx-ops
15272 dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	49 (cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=vx $(OP_SRCDIR)/vx-ops)
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	50
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	51 $(MX_OP_INC) $(MX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops
15272 dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	52 (cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx $(OP_SRCDIR)/mx-ops)
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	53
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	54 $(SMX_OP_INC) $(SMX_OP_SRC) : $(OP_SRCDIR)/sparse-mk-ops.awk operators/sparse-mx-ops
15272 dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	55 (cd operators; $(AWK) -f $(OP_SRCDIR)/sparse-mk-ops.awk prefix=smx $(OP_SRCDIR)/sparse-mx-ops)
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	56
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	57 operators/mx-ops.h : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	58 $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(OP_SRCDIR)/mx-ops > $@-t
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	59 mv $@-t $@
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	60
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	61 noinst_LTLIBRARIES += operators/liboperators.la
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	62
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	63 operators_liboperators_la_SOURCES = $(OPERATORS_SRC)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	64 nodist_operators_liboperators_la_SOURCES = $(BUILT_LIBOPERATORS_SOURCES)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	65
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	66 operators_liboperators_la_CPPFLAGS = $(liboctave_la_CPPFLAGS)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	67
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	68 DISTCLEANFILES += $(BUILT_LIBOPERATORS_SOURCES)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: diff changeset	69

Mercurial > octave-nkf

annotate liboctave/operators/module.mk @ 15272:dd794aa84232