Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / catgets / Makefile

diff --git a/catgets/Makefile b/catgets/Makefile
index a95028f2dd31093dd9120575ccba4bca8d547621..c3fbf99a5844184c9429c53905f6de018d22ad01 100644 (file)
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2000, 2002-2004, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-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
@@ -20,6 +20,8 @@
 #
 subdir := catgets
 
+include ../Makeconfig
+
 headers                = nl_types.h
 routines       = catgets open_catalog
 others         = gencat
@@ -29,7 +31,14 @@ extra-objs   = $(gencat-modules:=.o)
 tests = tst-catgets
 test-srcs = test-gencat
 
+ifeq ($(run-built-tests),yes)
+tests-special += $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
+                $(objpfx)sample.SJIS.cat $(objpfx)test-gencat.out
+tests-special += $(objpfx)tst-catgets-mem.out
+endif
+
 gencat-modules = xmalloc
+others-extras   = $(gencat-modules)
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
@@ -39,45 +48,50 @@ include ../Rules
 
 $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 
-catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
-           -DHAVE_CONFIG_H
+catgets-CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(localedir)/%l/%N:$(localedir)/%l/LC_MESSAGES/%N:"'
 
-CPPFLAGS-gencat = -DNOT_IN_libc
+generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
+            test-gencat.h
+generated += tst-catgets.mtrace tst-catgets-mem.out
 
-generated = de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
-           test-gencat.h
-generated-dirs = de
+generated-dirs += de
 
-tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
+tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de MALLOC_TRACE=$(objpfx)tst-catgets.mtrace
 
-ifneq ($(cross-compiling),yes)
-tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
-       $(objpfx)test-gencat.out
+ifeq ($(run-built-tests),yes)
 # This test just checks whether the program produces any error or not.
 # The result is not tested.
 $(objpfx)test1.cat: test1.msg $(objpfx)gencat
-       LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \
-       GCONV_PATH=$(common-objpfx)iconvdata \
-       $(built-program-cmd) -H $(objpfx)test1.h $@ $<
+       $(built-program-cmd-before-env) \
+       $(run-program-env) LC_ALL=hr_HR.ISO-8859-2 \
+       $(built-program-cmd-after-env) -H $(objpfx)test1.h $@ $<; \
+       $(evaluate-test)
 $(objpfx)test2.cat: test2.msg $(objpfx)gencat
-       LOCPATH=$(common-objpfx)localedata \
-       GCONV_PATH=$(common-objpfx)iconvdata \
-       $(built-program-cmd) -H $(objpfx)test2.h $@ $<
+       $(built-program-cmd) -H $(objpfx)test2.h $@ $<; \
+       $(evaluate-test)
 $(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
        $(make-target-directory)
-       LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \
-       GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<
+       $(built-program-cmd-before-env) \
+       $(run-program-env) LC_ALL=de_DE.ISO-8859-1 \
+       $(built-program-cmd-after-env) $@ $<; \
+       $(evaluate-test)
 $(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
 
 # Generate a non-simple input file.
-$(objpfx)de.msg: $(..)po/de.po
-       LC_ALL=C sed -f xopen-msg.sed $< > $@
+$(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
+       LC_ALL=C $(AWK) -f $^ $< > $@
 
 $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
                          $(objpfx)sample.SJIS.cat
-       $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+       $(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
+                '$(run-program-env)' '$(test-program-cmd-after-env)'; \
+       $(evaluate-test)
 
 $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
-       GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-       $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
+       $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@; \
+       $(evaluate-test)
+
+$(objpfx)tst-catgets-mem.out: $(objpfx)tst-catgets.out
+       $(common-objpfx)malloc/mtrace $(objpfx)tst-catgets.mtrace > $@; \
+       $(evaluate-test)
 endif