Mercurial > octave

diff src/module.mk @ 23495:8308417aff1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use automake %reldir% feature * configure.ac (AM_INIT_AUTOMAKE): Require automake 1.14. * doc/doxyhtml/module.mk, doc/interpreter/module.mk, doc/liboctave/module.mk, doc/module.mk, doc/refcard/module.mk, etc/module.mk, examples/module.mk, libgui/graphics/module.mk, libgui/module.mk, libgui/src/module.mk, libinterp/corefcn/module.mk, libinterp/dldfcn/config-module.awk, libinterp/module.mk, libinterp/octave-value/module.mk, libinterp/operators/module.mk, libinterp/parse-tree/module.mk, libinterp/template-inst/module.mk, liboctave/array/module.mk, liboctave/external/Faddeeva/module.mk, liboctave/external/amos/module.mk, liboctave/external/blas-xtra/module.mk, liboctave/external/daspk/module.mk, liboctave/external/dasrt/module.mk, liboctave/external/dassl/module.mk, liboctave/external/fftpack/module.mk, liboctave/external/lapack-xtra/module.mk, liboctave/external/module.mk, liboctave/external/odepack/module.mk, liboctave/external/ordered-qz/module.mk, liboctave/external/quadpack/module.mk, liboctave/external/ranlib/module.mk, liboctave/external/slatec-err/module.mk, liboctave/external/slatec-fn/module.mk, liboctave/module.mk, liboctave/numeric/module.mk, liboctave/operators/module.mk, liboctave/system/module.mk, liboctave/util/module.mk, liboctave/wrappers/module.mk, m4/module.mk, scripts/+containers/module.mk, scripts/@ftp/module.mk, scripts/audio/module.mk, scripts/deprecated/module.mk, scripts/elfun/module.mk, scripts/general/module.mk, scripts/geometry/module.mk, scripts/gui/module.mk, scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk, scripts/module.mk, scripts/ode/module.mk, scripts/optimization/module.mk, scripts/path/module.mk, scripts/pkg/module.mk, scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk, scripts/plot/util/module.mk, scripts/polynomial/module.mk, scripts/prefs/module.mk, scripts/profiler/module.mk, scripts/set/module.mk, scripts/signal/module.mk, scripts/sparse/module.mk, scripts/specfun/module.mk, scripts/special-matrix/module.mk, scripts/startup/module.mk, scripts/statistics/base/module.mk, scripts/statistics/distributions/module.mk, scripts/statistics/models/module.mk, scripts/statistics/tests/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/time/module.mk, src/module.mk, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-41723/module.mk, test/bug-44940/module.mk, test/bug-46660/module.mk, test/bug-50014/module.mk, test/bug-50035/module.mk, test/bug-50716/module.mk, test/class-concat/module.mk, test/classdef-multiple-inheritance/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, test/module.mk, test/nest/module.mk, test/publish/module.mk: Use %reldir% and %canon_reldir% where possible.
author John W. Eaton <jwe@octave.org>
date Mon, 15 May 2017 16:17:58 -0400
parents 48fd5980e29a
children cbef9fc53fef
line wrap: on
line diff
--- a/src/module.mk	Mon May 15 16:09:35 2017 +0100
+++ b/src/module.mk	Mon May 15 16:17:58 2017 -0400
@@ -1,8 +1,8 @@
-src_EXTRA_DIST =
+%canon_reldir%_EXTRA_DIST =
 
-src_CLEANFILES =
-src_DISTCLEANFILES =
-src_MAINTAINERCLEANFILES =
+%canon_reldir%_CLEANFILES =
+%canon_reldir%_DISTCLEANFILES =
+%canon_reldir%_MAINTAINERCLEANFILES =
 
 ## Search local directories before those specified by the user.
 
@@ -18,35 +18,35 @@
   -I$(srcdir)/src
 
 EXTRA_DIST += \
-  src/main.in.cc \
-  src/mkoctfile.in.cc \
-  src/octave-build-info.in.cc \
-  src/octave-config.in.cc
+  %reldir%/main.in.cc \
+  %reldir%/mkoctfile.in.cc \
+  %reldir%/octave-build-info.in.cc \
+  %reldir%/octave-config.in.cc
 
 bin_PROGRAMS += \
-  src/mkoctfile \
-  src/octave \
-  src/octave-cli \
-  src/octave-config
+  %reldir%/mkoctfile \
+  %reldir%/octave \
+  %reldir%/octave-cli \
+  %reldir%/octave-config
 
 OCTAVE_INTERPRETER_TARGETS += \
   $(bin_PROGRAMS) \
   $(OCTAVE_VERSION_LINKS)
 
 octinclude_HEADERS += \
-  src/octave-build-info.h
+  %reldir%/octave-build-info.h
 
 noinst_HEADERS += \
-  src/display-available.h \
-  src/shared-fcns.h
+  %reldir%/display-available.h \
+  %reldir%/shared-fcns.h
 
-OCTAVE_VERSION_LINKS += src/octave-cli-$(version)$(EXEEXT)
+OCTAVE_VERSION_LINKS += %reldir%/octave-cli-$(version)$(EXEEXT)
 
 if AMCOND_BUILD_QT_GUI
-  archlib_PROGRAMS += src/octave-gui
-  OCTAVE_VERSION_LINKS += src/octave-gui-$(version)$(EXEEXT)
+  archlib_PROGRAMS += %reldir%/octave-gui
+  OCTAVE_VERSION_LINKS += %reldir%/octave-gui-$(version)$(EXEEXT)
 
-  OCTAVE_INTERPRETER_TARGETS += src/octave-gui$(EXEEXT)
+  OCTAVE_INTERPRETER_TARGETS += %reldir%/octave-gui$(EXEEXT)
 endif
 
 OCTAVE_CORE_LIBS = \
@@ -54,18 +54,18 @@
   liboctave/liboctave.la \
   libgnu/libgnu.la
 
-nodist_src_octave_SOURCES = src/main.cc
+nodist_%canon_reldir%_octave_SOURCES = %reldir%/main.cc
 
-src_octave_SOURCES = src/display-available.c
+%canon_reldir%_octave_SOURCES = %reldir%/display-available.c
 
-src_octave_LDADD = \
+%canon_reldir%_octave_LDADD = \
   liboctave/wrappers/libwrappers.la \
   libgnu/libgnu.la \
   $(X11_LIBS) \
   $(CARBON_LIBS) \
   $(GNULIB_LINK_DEPS)
 
-src_octave_LDFLAGS = \
+%canon_reldir%_octave_LDFLAGS = \
   $(NO_UNDEFINED_LDFLAG) \
   $(OCTAVE_LINK_OPTS) \
   $(WARN_LDFLAGS)
@@ -74,93 +74,93 @@
   OCTAVE_CPPFLAGS = -DHAVE_OCTAVE_QT_GUI
 endif
 
-src_octave_CPPFLAGS = \
+%canon_reldir%_octave_CPPFLAGS = \
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-src_octave_CXXFLAGS = \
+%canon_reldir%_octave_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(WARN_CXXFLAGS)
 
-src_octave_cli_SOURCES = src/main-cli.cc
-nodist_src_octave_cli_SOURCES = src/octave-build-info.cc
+%canon_reldir%_octave_cli_SOURCES = %reldir%/main-cli.cc
+nodist_%canon_reldir%_octave_cli_SOURCES = %reldir%/octave-build-info.cc
 
-src_octave_cli_LDADD = \
+%canon_reldir%_octave_cli_LDADD = \
   $(OCTAVE_CORE_LIBS) \
   $(OCTAVE_LINK_DEPS)
 
-src_octave_cli_LDFLAGS = \
+%canon_reldir%_octave_cli_LDFLAGS = \
   $(NO_UNDEFINED_LDFLAG) \
   $(OCTAVE_LINK_OPTS) \
   $(WARN_LDFLAGS)
 
-src_octave_cli_CPPFLAGS = \
+%canon_reldir%_octave_cli_CPPFLAGS = \
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-src_octave_cli_CXXFLAGS = \
+%canon_reldir%_octave_cli_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(WARN_CXXFLAGS)
 
 if AMCOND_BUILD_QT_GUI
-  src_octave_gui_SOURCES = src/main-gui.cc
-  nodist_src_octave_gui_SOURCES = src/octave-build-info.cc
+  %canon_reldir%_octave_gui_SOURCES = %reldir%/main-gui.cc
+  nodist_%canon_reldir%_octave_gui_SOURCES = %reldir%/octave-build-info.cc
   OCTAVE_GUI_LIBS = libgui/liboctgui.la
   OCTAVE_GUI_CPPFLAGS = -I$(srcdir)/libgui -Ilibgui/src -I$(srcdir)/libgui/src
 endif
 
-src_octave_gui_CPPFLAGS = \
+%canon_reldir%_octave_gui_CPPFLAGS = \
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_GUI_CPPFLAGS)
 
-src_octave_gui_LDADD = \
+%canon_reldir%_octave_gui_LDADD = \
   $(OCTAVE_GUI_LIBS) \
   $(OCTAVE_CORE_LIBS) \
   $(OCTAVE_GUI_LINK_DEPS)
 
-src_octave_gui_LDFLAGS = \
+%canon_reldir%_octave_gui_LDFLAGS = \
   $(NO_UNDEFINED_LDFLAG) \
   $(OCTAVE_GUI_LINK_OPTS) \
   $(WARN_LDFLAGS)
 
-src_octave_gui_CXXFLAGS = \
+%canon_reldir%_octave_gui_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(WARN_CXXFLAGS)
 
-src_mkoctfile_SOURCES =
+%canon_reldir%_mkoctfile_SOURCES =
 
-nodist_src_mkoctfile_SOURCES = src/mkoctfile.cc
+nodist_%canon_reldir%_mkoctfile_SOURCES = %reldir%/mkoctfile.cc
 
-src_mkoctfile_LDADD = \
+%canon_reldir%_mkoctfile_LDADD = \
   liboctave/wrappers/libwrappers.la \
   libgnu/libgnu.la $(LIBS)
 
-src_mkoctfile_CPPFLAGS = \
+%canon_reldir%_mkoctfile_CPPFLAGS = \
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-src_mkoctfile_CXXFLAGS = \
+%canon_reldir%_mkoctfile_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(WARN_CXXFLAGS)
 
-src_octave_config_SOURCES =
+%canon_reldir%_octave_config_SOURCES =
 
-nodist_src_octave_config_SOURCES = src/octave-config.cc
+nodist_%canon_reldir%_octave_config_SOURCES = %reldir%/octave-config.cc
 
-src_octave_config_LDADD = \
+%canon_reldir%_octave_config_LDADD = \
   libinterp/corefcn/libcorefcn.la \
   libgnu/libgnu.la \
   $(LIBS)
 
-src_octave_config_CPPFLAGS = \
+%canon_reldir%_octave_config_CPPFLAGS = \
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-src_octave_config_CXXFLAGS = \
+%canon_reldir%_octave_config_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(WARN_CXXFLAGS)
 
-DIRSTAMP_FILES += src/$(octave_dirstamp)
+DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
 
 mostlyclean-local: src-mostlyclean-local
 .PHONY: src-mostlyclean-local
@@ -169,22 +169,22 @@
 
 ## Building cross mkoctfile.
 
-OCTAVE_CROSS_TOOLS += src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT)
+OCTAVE_CROSS_TOOLS += %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT)
 
-src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT): src/$(host_triplet)-mkoctfile.cc
-	$(BUILD_CXX) -o src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src src/$(host_triplet)-mkoctfile.cc
+%reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT): %reldir%/$(host_triplet)-mkoctfile.cc
+	$(BUILD_CXX) -o %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src %reldir%/$(host_triplet)-mkoctfile.cc
 
-src/$(host_triplet)-mkoctfile.cc: src/mkoctfile.in.cc build-aux/subst-cross-config-vals.sh | src/$(octave_dirstamp)
+%reldir%/$(host_triplet)-mkoctfile.cc: %reldir%/mkoctfile.in.cc build-aux/subst-cross-config-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-cross-config-vals.sh)
 
 ## Building cross octave-config.
 
-OCTAVE_CROSS_TOOLS += src/$(host_triplet)-octave-config$(BUILD_EXEEXT)
+OCTAVE_CROSS_TOOLS += %reldir%/$(host_triplet)-octave-config$(BUILD_EXEEXT)
 
-src/$(host_triplet)-octave-config$(BUILD_EXEEXT): src/$(host_triplet)-octave-config.cc
-	$(BUILD_CXX) -o src/$(host_triplet)-octave-config$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src src/$(host_triplet)-octave-config.cc
+%reldir%/$(host_triplet)-octave-config$(BUILD_EXEEXT): %reldir%/$(host_triplet)-octave-config.cc
+	$(BUILD_CXX) -o %reldir%/$(host_triplet)-octave-config$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src %reldir%/$(host_triplet)-octave-config.cc
 
-src/$(host_triplet)-octave-config.cc: src/octave-config.in.cc build-aux/subst-default-vals.sh | src/$(octave_dirstamp)
+%reldir%/$(host_triplet)-octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh)
 
 src-mostlyclean-local:
@@ -196,16 +196,16 @@
 
 endif
 
-src/octave-config.cc: src/octave-config.in.cc build-aux/subst-default-vals.sh | src/$(octave_dirstamp)
+%reldir%/octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh)
 
-src/mkoctfile.cc: src/mkoctfile.in.cc build-aux/subst-config-vals.sh | src/$(octave_dirstamp)
+%reldir%/mkoctfile.cc: %reldir%/mkoctfile.in.cc build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh)
 
-src/main.cc: src/main.in.cc build-aux/subst-default-vals.sh | src/$(octave_dirstamp)
+%reldir%/main.cc: %reldir%/main.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh)
 
-src/octave-build-info.cc: src/octave-build-info.in.cc HG-ID | src/$(octave_dirstamp)
+%reldir%/octave-build-info.cc: %reldir%/octave-build-info.in.cc HG-ID | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(build-info-commands)
 
 ALL_LOCAL_TARGETS += $(OCTAVE_CROSS_TOOLS)
@@ -231,30 +231,30 @@
 ## We need these filenames in the build tree because the wrapper
 ## program (main.cc) will try to invoke the versioned binaries.
 
-src/octave-cli-$(version)$(EXEEXT): src/octave-cli$(EXEEXT)
+%reldir%/octave-cli-$(version)$(EXEEXT): %reldir%/octave-cli$(EXEEXT)
 	$(AM_V_GEN)rm -f $@ && \
 	cd $(@D) && $(LN_S) $(<F) $(@F)
 
-src/octave-gui-$(version)$(EXEEXT): src/octave-gui$(EXEEXT)
+%reldir%/octave-gui-$(version)$(EXEEXT): %reldir%/octave-gui$(EXEEXT)
 	$(AM_V_GEN)rm -f $@ && \
 	cd $(@D) && $(LN_S) $(<F) $(@F)
 
-src_CLEANFILES += \
+%canon_reldir%_CLEANFILES += \
   $(OCTAVE_VERSION_LINKS) \
-  src/main.cc \
-  src/mkoctfile.cc \
-  src/octave-build-info.cc \
-  src/octave-config.cc
+  %reldir%/main.cc \
+  %reldir%/mkoctfile.cc \
+  %reldir%/octave-build-info.cc \
+  %reldir%/octave-config.cc
 
-CLEANFILES += $(src_CLEANFILES)
-DISTCLEANFILES += $(src_DISTCLEANFILES)
-MAINTAINERCLEANFILES += $(src_MAINTAINERCLEANFILES)
+CLEANFILES += $(%canon_reldir%_CLEANFILES)
+DISTCLEANFILES += $(%canon_reldir%_DISTCLEANFILES)
+MAINTAINERCLEANFILES += $(%canon_reldir%_MAINTAINERCLEANFILES)
 
 src-clean:
-	rm -f $(src_CLEANFILES)
+	rm -f $(%canon_reldir%_CLEANFILES)
 
 src-distclean: src-clean
-	rm -f $(src_DISTCLEANFILES)
+	rm -f $(%canon_reldir%_DISTCLEANFILES)
 
 src-maintainer-clean: src-distclean
-	rm -f $(src_MAINTAINERCLEANFILES)
+	rm -f $(%canon_reldir%_MAINTAINERCLEANFILES)