From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jul 2007 17:01:01 +0000 (+0000)
Subject: libuniname is gone.
X-Git-Tag: v0.17~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a26f8708e010c1212c809a9dcfab9d3c8d2bf2f;p=thirdparty%2Fgettext.git

libuniname is gone.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 55fb9679e..da7353483 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,5 +1,6 @@
 2007-07-07  Bruno Haible  <bruno@clisp.org>
 
+	* configure.ac: Don't create libuniname/Makefile.
 	* Makefile.am (SUBDIRS): Remove libuniname.
 
 2007-05-28  Bruno Haible  <bruno@clisp.org>
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 351becae9..3adbeb023 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -362,9 +362,6 @@ AC_CONFIG_FILES([gnulib-lib/Makefile],
 AC_CONFIG_FILES([libgrep/Makefile],
                 [FIX_MAKEFILE_COMPILE])
 
-AC_CONFIG_FILES([libuniname/Makefile],
-                [FIX_MAKEFILE_COMPILE])
-
 AC_CONFIG_FILES([src/Makefile],
                 [FIX_MAKEFILE_COMPILE])
 AC_CONFIG_FILES([src/user-email:src/user-email.sh.in])
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index e974a11be..d884b2200 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-07  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (AM_CPPFLAGS): Remove reference to libuniname directory.
+	(LIBUNINAME): Remove variable.
+	(xgettext_LDADD): Update.
+
 2007-07-04  Bruno Haible  <bruno@clisp.org>
 
 	Recognize the PHP string concatenation operator.
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 827cbfca9..cebb5bc9a 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -66,7 +66,6 @@ AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. -I$(top_srcdir) \
   -I$(top_srcdir)/libgrep \
-  -I$(top_srcdir)/libuniname \
   -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
   -I../intl -I$(top_srcdir)/../gettext-runtime/intl
 DEFS = \
@@ -128,9 +127,6 @@ $(FORMAT_SOURCE)
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
 
-# x-python needs table of Unicode character names.
-LIBUNINAME = ../libuniname/libuniname.a
-
 # Source dependencies.
 msgcmp_SOURCES = msgcmp.c
 msgfmt_SOURCES = msgfmt.c
@@ -244,7 +240,7 @@ msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
 msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-xgettext_LDADD = $(LIBUNINAME) libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD)
+xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD)
 msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
diff --git a/os2/Makefile b/os2/Makefile
index acbf2b3bc..5824dee41 100644
--- a/os2/Makefile
+++ b/os2/Makefile
@@ -115,13 +115,6 @@ LIB.SOURCES = $(addprefix $(ROOT)lib/, error.c stpcpy.c stpncpy.c mkdtemp.c getl
   $(shell sed $(ROOT)lib/Makefile.am -ne "/^libgettextlib_la_SOURCES =/,/[^\]$$/p"))))))
 LIB.OBJECTS = $(addprefix $(OUT),$(subst $(ROOT),,$(LIB.SOURCES:.c=.o)))
 
-LIBUNINAME.SOURCES = $(addprefix $(ROOT)libuniname/, \
-  $(subst libuniname_a_SOURCES = ,,\
-  $(subst \,,\
-  $(patsubst %.h,,\
-  $(shell sed $(ROOT)libuniname/Makefile.am -ne "/^libuniname_a_SOURCES =/,/^$$/p")))))
-LIBUNINAME.OBJECTS = $(addprefix $(OUT),$(subst $(ROOT),,$(LIBUNINAME.SOURCES:.c=.o)))
-
 OUTDIRS = $(OUT) $(sort $(dir $(INTL.OBJECTS) $(SRC.OBJECTS) $(LIB.OBJECTS) \
   $(LIBUNINAME.OBJECTS) $(INSTALL.FILES)))