Mercurial > hg > octave-nkf

annotate libinterp/link-deps.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 acf0addfc610
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15208
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
1 include $(top_srcdir)/liboctave/link-deps.mk
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 if AMCOND_ENABLE_DYNAMIC_LINKING
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 LIBOCTINTERP_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else
15076
000587f92082 rename src/DLD-FUNCTIONS directory to src/dldfcn
John W. Eaton <jwe@octave.org>
parents: 15049
diff changeset
6 LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 endif
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 LIBOCTINTERP_LINK_DEPS += \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 $(GRAPHICS_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 $(FT2_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 $(HDF5_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 $(Z_LIBS) \
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14899
diff changeset
14 $(FFTW_XLIBS) \
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14899
diff changeset
15 $(REGEX_LIBS) \
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 $(OPENGL_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 $(X11_LIBS) \
14899
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
18 $(CARBON_LIBS) \
15049
e499ebcd3b0f Add LAPACK_LIBS to link dependencies of liboctinterp
Carlo de Falco <cdf@users.sourceforge.net>
parents: 15039
diff changeset
19 $(LLVM_LIBS) \
e499ebcd3b0f Add LAPACK_LIBS to link dependencies of liboctinterp
Carlo de Falco <cdf@users.sourceforge.net>
parents: 15039
diff changeset
20 $(LAPACK_LIBS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 LIBOCTINTERP_LINK_OPTS = \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 $(GRAPHICS_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 $(FT2_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 $(HDF5_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 $(Z_LDFLAGS) \
14899
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
27 $(REGEX_LDFLAGS) \
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14899
diff changeset
28 $(FFTW_XLDFLAGS) \
14899
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
29 $(LLVM_LDFLAGS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 OCT_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
13024
f3c53fea9fb5 maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents: 13022
diff changeset
33 OCT_LINK_OPTS = $(LDFLAGS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 if AMCOND_LINK_ALL_DEPS
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 endif