Mercurial > hg > octave-jordi

view liboctave/operators/module.mk @ 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 535bb601e7db
line wrap: on
line source

EXTRA_DIST += \
  operators/module.mk \
  operators/config-ops.sh \
  operators/mk-ops.awk \
  operators/mx-op-inc.mk \
  operators/mx-op-src.mk \
  operators/mx-ops \
  operators/smx-op-inc.mk \
  operators/smx-op-src.mk \
  operators/sparse-mk-ops.awk \
  operators/sparse-mx-ops \
  operators/vx-op-inc.mk \
  operators/vx-op-src.mk \
  operators/vx-ops

include operators/vx-op-inc.mk
include operators/mx-op-inc.mk
include operators/smx-op-inc.mk

include operators/vx-op-src.mk
include operators/mx-op-src.mk
include operators/smx-op-src.mk

BUILT_LIBOPERATORS_SOURCES = \
  $(MX_OP_SRC) \
  $(VX_OP_SRC) \
  $(SMX_OP_SRC)

OPERATORS_INC = \
  operators/mx-base.h \
  operators/mx-defs.h \
  operators/mx-ext.h \
  operators/mx-op-decl.h \
  operators/mx-op-defs.h \
  operators/Sparse-diag-op-defs.h \
  operators/Sparse-op-defs.h \
  operators/Sparse-perm-op-defs.h

## There are no distributed source files in this directory
OPERATORS_SRC =

OTHER_INC += \
  operators/mx-inlines.cc

OP_SRCDIR = $(srcdir)/operators

## 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)

$(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)

$(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)

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
	mv $@-t $@

noinst_LTLIBRARIES += operators/liboperators.la

operators_liboperators_la_SOURCES = $(OPERATORS_SRC)
nodist_operators_liboperators_la_SOURCES = $(BUILT_LIBOPERATORS_SOURCES)

operators_liboperators_la_CPPFLAGS = $(liboctave_la_CPPFLAGS)

DISTCLEANFILES += $(BUILT_LIBOPERATORS_SOURCES)