Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / grp / Makefile

diff --git a/grp/Makefile b/grp/Makefile
index 3ed8471fdd11fef46e6e80a8caaf6d44fd5cd0af..9477cc67de96b9570430537aea67822a56bfea78 100644 (file)
--- a/grp/Makefile
+++ b/grp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2014 Free Software Foundation, Inc.
+# Copyright (C) 1991-2019 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -13,7 +13,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 #
 #      Sub-makefile for grp portion of the library.
@@ -26,12 +26,16 @@ headers := grp.h
 
 routines := fgetgrent initgroups setgroups \
            getgrent getgrgid getgrnam putgrent \
-           getgrent_r getgrgid_r getgrnam_r fgetgrent_r
+           getgrent_r getgrgid_r getgrnam_r fgetgrent_r \
+           grp-merge
 
-tests := testgrp
+tests := testgrp tst-putgrent
 
 ifeq (yes,$(build-shared))
 test-srcs :=  tst_fgetgrent
+ifeq ($(run-built-tests),yes)
+tests-special += $(objpfx)tst_fgetgrent.out
+endif
 endif
 
 
@@ -39,24 +43,23 @@ include ../Rules
 
 ifeq ($(have-thread-library),yes)
 
-CFLAGS-getgrgid_r.c = -fexceptions
-CFLAGS-getgrnam_r.c = -fexceptions
-CFLAGS-getgrent_r.c = -fexceptions
-CFLAGS-getgrent.c = -fexceptions
-CFLAGS-fgetgrent.c = -fexceptions
-CFLAGS-fgetgrent_r.c = -fexceptions $(libio-mtsafe)
-CFLAGS-putgrent.c = -fexceptions $(libio-mtsafe)
-CFLAGS-initgroups.c = -fexceptions
-CFLAGS-getgrgid.c = -fexceptions
+CFLAGS-getgrgid_r.c += -fexceptions
+CFLAGS-getgrnam_r.c += -fexceptions
+CFLAGS-getgrent_r.c += -fexceptions
+CFLAGS-getgrent.c += -fexceptions
+CFLAGS-fgetgrent.c += -fexceptions
+CFLAGS-fgetgrent_r.c += -fexceptions $(libio-mtsafe)
+CFLAGS-putgrent.c += -fexceptions $(libio-mtsafe)
+CFLAGS-initgroups.c += -fexceptions
+CFLAGS-getgrgid.c += -fexceptions
 
 endif
 
 ifeq ($(run-built-tests),yes)
 # tst_fgetgrent currently only works with shared libraries
 ifeq (yes,$(build-shared))
-tests: $(objpfx)tst_fgetgrent.out
 $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent
-       $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+       $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' > $@; \
        $(evaluate-test)
 
 endif