From 9fe919456e8e0048a2f492cf0e5c6c581ca778b7 Mon Sep 17 00:00:00 2001 From: mmitchel Date: Tue, 28 Feb 2006 00:41:19 +0000 Subject: PR 26473 * configure.ac (ACX_NONCANONICAL_TARGET): Use it. * Makefile.am (target_noncanonical): Define. (libsubincludedir): New variable. (nobase_libsubinclude_HEADERS): Likewise. (nobase_include_HEADERS): Remove. * configure: Regenerated. * Makefile.in: Likewise. * aclocal.m4: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111501 138bc75d-0d04-0410-961f-82ee72b054a4 --- libssp/Makefile.in | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'libssp/Makefile.in') diff --git a/libssp/Makefile.in b/libssp/Makefile.in index 8dc464d4e1a..8dfa8f4fe66 100644 --- a/libssp/Makefile.in +++ b/libssp/Makefile.in @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(am__configure_deps) $(nobase_include_HEADERS) \ +DIST_COMMON = $(am__configure_deps) $(nobase_libsubinclude_HEADERS) \ $(srcdir)/../compile $(srcdir)/../config.guess \ $(srcdir)/../config.sub $(srcdir)/../depcomp \ $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ @@ -50,7 +50,8 @@ DIST_COMMON = $(am__configure_deps) $(nobase_include_HEADERS) \ $(top_srcdir)/ssp/ssp.h.in ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -67,7 +68,7 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \ - "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(libsubincludedir)" toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am_libssp_la_OBJECTS = ssp.lo gets-chk.lo memcpy-chk.lo memmove-chk.lo \ @@ -96,8 +97,8 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -nobase_includeHEADERS_INSTALL = $(install_sh_DATA) -HEADERS = $(nobase_include_HEADERS) +nobase_libsubincludeHEADERS_INSTALL = $(install_sh_DATA) +HEADERS = $(nobase_libsubinclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -204,6 +205,7 @@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ +target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ @@ -220,7 +222,8 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) @LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map AM_CFLAGS = -Wall toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la -nobase_include_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h +libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include +nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h libssp_la_SOURCES = \ ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ @@ -450,24 +453,24 @@ distclean-multi: maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) uninstall-info-am: -install-nobase_includeHEADERS: $(nobase_include_HEADERS) +install-nobase_libsubincludeHEADERS: $(nobase_libsubinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" + test -z "$(libsubincludedir)" || $(mkdir_p) "$(DESTDIR)$(libsubincludedir)" @$(am__vpath_adj_setup) \ - list='$(nobase_include_HEADERS)'; for p in $$list; do \ + list='$(nobase_libsubinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ $(am__vpath_adj) \ - echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nobase_libsubincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libsubincludedir)/$$f'"; \ + $(nobase_libsubincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libsubincludedir)/$$f"; \ done -uninstall-nobase_includeHEADERS: +uninstall-nobase_libsubincludeHEADERS: @$(NORMAL_UNINSTALL) @$(am__vpath_adj_setup) \ - list='$(nobase_include_HEADERS)'; for p in $$list; do \ + list='$(nobase_libsubinclude_HEADERS)'; for p in $$list; do \ $(am__vpath_adj) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(libsubincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(libsubincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -649,7 +652,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h installdirs: - for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(libsubincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -698,7 +701,7 @@ info: info-am info-am: -install-data-am: install-nobase_includeHEADERS +install-data-am: install-nobase_libsubincludeHEADERS install-exec-am: install-multi install-toolexeclibLTLIBRARIES @@ -728,7 +731,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS \ +uninstall-am: uninstall-info-am uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES .PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \ @@ -741,13 +744,13 @@ uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-multi \ - install-nobase_includeHEADERS install-strip \ + install-nobase_libsubincludeHEADERS install-strip \ install-toolexeclibLTLIBRARIES installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-multi mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-nobase_includeHEADERS \ + uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. -- cgit v1.2.3