Mercurial > octave
changeset 24567:3fa85fe6e495
don't install config.h (bug #52837)
* deprecated-config.h: Delete.
* libinterp/module.mk (%canon_reldir%_EXTRA_DIST):
Remove %reldir%/deprecated-config.h from the list.
(install-data-hook): Don't depend on install-deprecated-config-h.
(uninstall-local): Don't depend on uninstall-deprecated-config-h.
(install-deprecated-config-h, uninstall-deprecated-config-h):
Delete targets.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 08 Jan 2018 22:13:35 -0500 |
| parents | f5bcbd321ba1 |
| children | 4db06f3bc34f |
| files | libinterp/deprecated-config.h libinterp/module.mk |
| diffstat | 2 files changed, 2 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/deprecated-config.h Mon Jan 08 20:01:13 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - -Copyright (C) 2016-2017 Mike Miller - -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 -<https://www.gnu.org/licenses/>. - -*/ - -#if ! defined (octave_config_h) -#define octave_config_h 1 - -#include "octave-config.h" - -#warning "config.h has been deprecated; there is no need to include it directly" - -#endif
--- a/libinterp/module.mk Mon Jan 08 20:01:13 2018 -0500 +++ b/libinterp/module.mk Mon Jan 08 22:13:35 2018 -0500 @@ -81,7 +81,6 @@ %canon_reldir%_EXTRA_DIST += \ %reldir%/DOCSTRINGS \ %reldir%/build-env.in.cc \ - %reldir%/deprecated-config.h \ %reldir%/liboctinterp-build-info.in.cc \ %reldir%/mk-build-env-features.sh \ %reldir%/mk-builtins.pl \ @@ -285,9 +284,9 @@ DIRSTAMP_FILES += %reldir%/$(octave_dirstamp) -install-data-hook: install-oct install-built-in-docstrings install-deprecated-config-h +install-data-hook: install-oct install-built-in-docstrings -uninstall-local: uninstall-oct uninstall-built-in-docstrings uninstall-deprecated-config-h +uninstall-local: uninstall-oct uninstall-built-in-docstrings if AMCOND_ENABLE_DYNAMIC_LINKING install-oct: @@ -328,15 +327,6 @@ rm -f $(DESTDIR)$(octetcdir)/built-in-docstrings .PHONY: uninstall-built-in-docstrings -install-deprecated-config-h: %reldir%/deprecated-config.h - $(MKDIR_P) $(DESTDIR)$(octincludedir) - $(INSTALL_DATA) $< $(DESTDIR)$(octincludedir)/config.h -.PHONY: install-deprecated-config-h - -uninstall-deprecated-config-h: - rm -f $(DESTDIR)$(octincludedir)/config.h -.PHONY: uninstall-deprecated-config-h - EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST) %canon_reldir%_CLEANFILES += \