Mercurial > octave-nkf

comparison liboctave/cruft/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 e359158c917f
comparison
equal deleted inserted replaced
15271:648dabbb4c6b 15272:dd794aa84232
24 24
25 ## Search local directories before those specified by the user. 25 ## Search local directories before those specified by the user.
26 AM_CPPFLAGS = \ 26 AM_CPPFLAGS = \
27 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu 27 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
28 28
29 octlib_LTLIBRARIES = libcruft.la 29 noinst_LTLIBRARIES = libcruft.la
30 30
31 libcruft_la_SOURCES = 31 libcruft_la_SOURCES =
32 32
33 nodist_libcruft_la_SOURCES = 33 nodist_libcruft_la_SOURCES =
34 34
36 36
37 libcruft_la_CPPFLAGS = \ 37 libcruft_la_CPPFLAGS = \
38 @CRUFT_DLL_DEFS@ \ 38 @CRUFT_DLL_DEFS@ \
39 $(AM_CPPFLAGS) 39 $(AM_CPPFLAGS)
40 40
41 include link-deps.mk
42
43 libcruft_la_LIBADD = \
44 libranlib.la \
45 $(top_builddir)/libgnu/libgnu.la \
46 $(LIBCRUFT_LINK_DEPS)
47
48 # Increment these as needed and according to the rules in the libtool manual:
49 libcruft_current = 1
50 libcruft_revision = 0
51 libcruft_age = 0
52
53 libcruft_version_info = $(libcruft_current):$(libcruft_revision):$(libcruft_age)
54
55 libcruft_la_LDFLAGS = \
56 -version-info $(libcruft_version_info) \
57 $(NO_UNDEFINED_LDFLAG) \
58 @XTRA_CRUFT_SH_LDFLAGS@ \
59 -bindir $(bindir) \
60 $(LIBCRUFT_LINK_OPTS)
61
62 libcruft_la_DEPENDENCIES = cruft.def 41 libcruft_la_DEPENDENCIES = cruft.def
63 42
64 noinst_LTLIBRARIES = libranlib.la 43 noinst_LTLIBRARIES += ranlib/libranlib.la
65 44
66 libranlib_la_SOURCES = 45 ranlib_libranlib_la_SOURCES =
67 46
68 libranlib_la_DEPENDENCIES = ranlib.def 47 ranlib_libranlib_la_DEPENDENCIES = ranlib.def
69 48
70 octinclude_HEADERS = 49 octinclude_HEADERS =
71 50
72 EXTRA_DIST = 51 EXTRA_DIST =
73 52