User account creation filtered due to spam.

View | Details | Raw Unified | Return to bug 26473 | Differences between
and this patch

Collapse All | Expand All

(-)libssp/Makefile.in (-19 / +20 lines)
Lines 40-46 Link Here
40
build_triplet = @build@
40
build_triplet = @build@
41
host_triplet = @host@
41
host_triplet = @host@
42
target_triplet = @target@
42
target_triplet = @target@
43
DIST_COMMON = $(am__configure_deps) $(nobase_include_HEADERS) \
43
DIST_COMMON = $(am__configure_deps) $(nobase_toolinclude_HEADERS) \
44
	$(srcdir)/../compile $(srcdir)/../config.guess \
44
	$(srcdir)/../compile $(srcdir)/../config.guess \
45
	$(srcdir)/../config.sub $(srcdir)/../depcomp \
45
	$(srcdir)/../config.sub $(srcdir)/../depcomp \
46
	$(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
46
	$(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
Lines 67-73 Link Here
67
  esac;
67
  esac;
68
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
68
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
69
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
69
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
70
	"$(DESTDIR)$(includedir)"
70
	"$(DESTDIR)$(toolincludedir)"
71
toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
71
toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
72
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
72
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
73
am_libssp_la_OBJECTS = ssp.lo gets-chk.lo memcpy-chk.lo memmove-chk.lo \
73
am_libssp_la_OBJECTS = ssp.lo gets-chk.lo memcpy-chk.lo memmove-chk.lo \
Lines 96-103 Link Here
96
MULTISUBDIR = 
96
MULTISUBDIR = 
97
MULTIDO = true
97
MULTIDO = true
98
MULTICLEAN = true
98
MULTICLEAN = true
99
nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
99
nobase_toolincludeHEADERS_INSTALL = $(install_sh_DATA)
100
HEADERS = $(nobase_include_HEADERS)
100
HEADERS = $(nobase_toolinclude_HEADERS)
101
ETAGS = etags
101
ETAGS = etags
102
CTAGS = ctags
102
CTAGS = ctags
103
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
103
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
Lines 220-226 Link Here
220
@LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map
220
@LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map
221
AM_CFLAGS = -Wall
221
AM_CFLAGS = -Wall
222
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
222
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
223
nobase_include_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
223
toolincludedir = $(toolexeclibdir)/include
224
nobase_toolinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
224
libssp_la_SOURCES = \
225
libssp_la_SOURCES = \
225
	ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
226
	ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
226
	memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
227
	memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
Lines 450-473 Link Here
450
maintainer-clean-multi:
451
maintainer-clean-multi:
451
	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
452
	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
452
uninstall-info-am:
453
uninstall-info-am:
453
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
454
install-nobase_toolincludeHEADERS: $(nobase_toolinclude_HEADERS)
454
	@$(NORMAL_INSTALL)
455
	@$(NORMAL_INSTALL)
455
	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
456
	test -z "$(toolincludedir)" || $(mkdir_p) "$(DESTDIR)$(toolincludedir)"
456
	@$(am__vpath_adj_setup) \
457
	@$(am__vpath_adj_setup) \
457
	list='$(nobase_include_HEADERS)'; for p in $$list; do \
458
	list='$(nobase_toolinclude_HEADERS)'; for p in $$list; do \
458
	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
459
	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
459
	  $(am__vpath_adj) \
460
	  $(am__vpath_adj) \
460
	  echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
461
	  echo " $(nobase_toolincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(toolincludedir)/$$f'"; \
461
	  $(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
462
	  $(nobase_toolincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(toolincludedir)/$$f"; \
462
	done
463
	done
463
464
464
uninstall-nobase_includeHEADERS:
465
uninstall-nobase_toolincludeHEADERS:
465
	@$(NORMAL_UNINSTALL)
466
	@$(NORMAL_UNINSTALL)
466
	@$(am__vpath_adj_setup) \
467
	@$(am__vpath_adj_setup) \
467
	list='$(nobase_include_HEADERS)'; for p in $$list; do \
468
	list='$(nobase_toolinclude_HEADERS)'; for p in $$list; do \
468
	  $(am__vpath_adj) \
469
	  $(am__vpath_adj) \
469
	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
470
	  echo " rm -f '$(DESTDIR)$(toolincludedir)/$$f'"; \
470
	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
471
	  rm -f "$(DESTDIR)$(toolincludedir)/$$f"; \
471
	done
472
	done
472
473
473
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
474
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
Lines 649-655 Link Here
649
check: check-am
650
check: check-am
650
all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h
651
all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h
651
installdirs:
652
installdirs:
652
	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(includedir)"; do \
653
	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolincludedir)"; do \
653
	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
654
	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
654
	done
655
	done
655
install: install-am
656
install: install-am
Lines 698-704 Link Here
698
699
699
info-am:
700
info-am:
700
701
701
install-data-am: install-nobase_includeHEADERS
702
install-data-am: install-nobase_toolincludeHEADERS
702
703
703
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
704
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
704
705
Lines 728-734 Link Here
728
729
729
ps-am:
730
ps-am:
730
731
731
uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS \
732
uninstall-am: uninstall-info-am uninstall-nobase_toolincludeHEADERS \
732
	uninstall-toolexeclibLTLIBRARIES
733
	uninstall-toolexeclibLTLIBRARIES
733
734
734
.PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \
735
.PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \
Lines 741-753 Link Here
741
	html-am info info-am install install-am install-data \
742
	html-am info info-am install install-am install-data \
742
	install-data-am install-exec install-exec-am install-info \
743
	install-data-am install-exec install-exec-am install-info \
743
	install-info-am install-man install-multi \
744
	install-info-am install-man install-multi \
744
	install-nobase_includeHEADERS install-strip \
745
	install-nobase_toolincludeHEADERS install-strip \
745
	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
746
	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
746
	installdirs maintainer-clean maintainer-clean-generic \
747
	installdirs maintainer-clean maintainer-clean-generic \
747
	maintainer-clean-multi mostlyclean mostlyclean-compile \
748
	maintainer-clean-multi mostlyclean mostlyclean-compile \
748
	mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
749
	mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
749
	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
750
	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
750
	uninstall-nobase_includeHEADERS \
751
	uninstall-nobase_toolincludeHEADERS \
751
	uninstall-toolexeclibLTLIBRARIES
752
	uninstall-toolexeclibLTLIBRARIES
752
753
753
# Tell versions [3.59,3.63) of GNU make to not export all variables.
754
# Tell versions [3.59,3.63) of GNU make to not export all variables.
(-)libssp/Makefile.am (-1 / +2 lines)
Lines 23-29 Link Here
23
23
24
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
24
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
25
25
26
nobase_include_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
26
toolincludedir = $(toolexeclibdir)/include
27
nobase_toolinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
27
28
28
libssp_la_SOURCES = \
29
libssp_la_SOURCES = \
29
	ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
30
	ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \

Return to bug 26473