* catgets/open_catalog.c (__open_catalog): Don't use a value type

[platform/upstream/glibc.git] / catgets / Makefile

diff --git a/catgets/Makefile b/catgets/Makefile
index caf8eec..f3069bd 100644 (file)
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -1,20 +1,20 @@
-# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2000,2002 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
-# modify it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library 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
-# Library General Public License for more details.
+# Lesser General Public License for more details.
 
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
 
 #
 #      Makefile for catgets.
@@ -22,13 +22,15 @@
 subdir := catgets
 
 headers                = nl_types.h
-distribute     = catgetsinfo.h config.h xopen-msg.sed test1.msg
+distribute     = catgetsinfo.h config.h xopen-msg.sed test1.msg \
+                 test-gencat.sh sample.SJIS
 routines       = catgets open_catalog
 others         = gencat
 install-bin    = gencat
 extra-objs     = $(gencat-modules:=.o)
 
 tests = tst-catgets
+test-srcs = test-gencat
 
 gencat-modules = xmalloc
 
@@ -43,13 +45,15 @@ $(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
 
-generated = de.msg test1.cat test1.h
+CPPFLAGS-gencat = -DNOT_IN_libc
+
+generated = de.msg test1.cat test1.h sample.SJIS.cat test-gencat.h
 generated-dirs = de
 
 tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
 
 ifneq ($(cross-compiling),yes)
-tests: $(objpfx)de/libc.cat $(objpfx)test1.cat
+tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test-gencat.out
 # This test just checks whether the program produces any error or not.
 # The result is not tested.
 $(objpfx)test1.cat: test1.msg $(objpfx)gencat
@@ -65,4 +69,12 @@ $(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
 # Generate a non-simple input file.
 $(objpfx)de.msg: $(..)po/de.po
        sed -f xopen-msg.sed $< > $@
+
+$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
+                         $(objpfx)sample.SJIS.cat
+       $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+
+$(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,$^) > $@
 endif