Mercurial > octave
view src/Makefile.am @ 15208:2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
* libgui/src/link-deps.mk: New file.
* libgui/src/Makefile.am: Include it.
(QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): New variables.
(liboctgui_la_CPPFLAGS): Use $(QT_INCDIR).
(liboctgui_current, liboctgui_revision, liboctgui_age,
liboctgui_version): Ne variables.
(liboctgui_la_LDFLAGS): Use -version option, $(NO_UNDEFINED_LDFLAG),
-bindir option, and $(LIBOCTGUI_LINK_OPTS).
(liboctgui_la_LIBADD): Use $(LIBOCTGUI_LINK_DEPS).
* src/Makefile.am: Include ../libgui/src/link-deps.mk.
(octave_LDADD): Move $(OCTAVE_GUI_LIBS) ahead of $(OCTAVE_CORE_LIBS).
Use $(OCTAVE_GUI_LINK_DEPS).
(octave_LDFLAGS): Use $(NO_UNDEFINED_LDFLAG) and
$(OCTAVE_GUI_LINK_OPTS) instead of $(octave_cli_LDFLAGS).
* liboctave/link-deps.mk, libinterp/link-deps.mk: Use $(top_srcdir)/
instead of ../ to reference other link-deps.mk files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 20 Aug 2012 15:37:54 -0400 |
parents | 017f0b2e6933 |
children | 947cf10c94da b7f9d2c99a06 |
line wrap: on
line source
# Makefile for Octave's src directory # # Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. # # Octave is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 3 of the License, or (at # your option) any later version. # # Octave is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # # You should have received a copy of the GNU General Public License # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. include $(top_srcdir)/build-aux/common.mk ## Search local directories before those specified by the user. AM_CPPFLAGS = \ -I$(srcdir)/../libinterp \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu if AMCOND_BUILD_COMPILED_AUX_PROGRAMS bin_PROGRAMS = \ mkoctfile \ $(OCTAVE_PROGRAMS) \ octave-config mkoctfile_SOURCES = nodist_mkoctfile_SOURCES = mkoctfile.cc mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS) octave_config_SOURCES = nodist_octave_config_SOURCES = octave-config.cc octave_config_LDADD = \ corefcn/libcorefcn.la \ $(top_builddir)/libgnu/libgnu.la \ $(LIBS) BUILT_SOURCES_EXTRA = \ mkoctfile.cc \ octave-config.cc else bin_PROGRAMS = \ octave \ octave-cli bin_SCRIPTS = \ mkoctfile \ octave-config endif EXTRA_DIST = \ mkoctfile.in.cc \ mkoctfile.in.sh \ octave-config.in.cc \ octave-config.in.sh OCTAVE_CORE_LIBS = \ ../libinterp/liboctinterp.la \ ../liboctave/liboctave.la \ ../libcruft/libcruft.la include ../libgui/src/link-deps.mk octave_cli_SOURCES = main-cli.cc octave_cli_LDADD = \ $(OCTAVE_CORE_LIBS) $(OCTAVE_LINK_DEPS) octave_cli_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) if AMCOND_BUILD_GUI octave_SOURCES = main.cc OCTAVE_GUI_LIBS = ../libgui/src/liboctgui.la OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src else octave_SOURCES = main-cli.cc OCTAVE_GUI_LIBS = OCTAVE_GUI_CPPFLAGS = endif octave_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(OCTAVE_GUI_CPPFLAGS) octave_LDADD = \ $(OCTAVE_GUI_LIBS) \ $(OCTAVE_CORE_LIBS) \ $(OCTAVE_GUI_LINK_DEPS) octave_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) if AMCOND_BUILD_COMPILED_AUX_PROGRAMS octave-config.cc: octave-config.in.cc Makefile @$(do_subst_default_vals) mkoctfile.cc: mkoctfile.in.cc Makefile @$(do_subst_config_vals) else octave-config: octave-config.in.sh Makefile @$(do_subst_default_vals) chmod a+rx $@ mkoctfile: mkoctfile.in.sh Makefile @$(do_subst_config_vals) chmod a+rx $@ endif install-exec-hook: make-version-links uninstall-local: remove-version-links make-version-links: cd $(DESTDIR)$(bindir) && \ for f in $(basename $(bin_PROGRAMS)); do \ mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ done if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS cd $(DESTDIR)$(bindir) && \ for f in $(basename $(bin_SCRIPTS)); do \ mv $$f $$f-$(version) && \ $(LN_S) $$f-$(version) $$f; \ done endif remove-version-links: for f in $(basename $(bin_PROGRAMS)); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ done if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS for f in $(basename $(bin_SCRIPTS)); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version); \ done endif .PHONY: make-version-links remove-version-links CLEANFILES = \ $(bin_SCRIPTS)