From: Howard Chu <hyc@openldap.org>
Date: Mon, 31 May 2004 01:58:13 +0000 (+0000)
Subject: Use hardcoded Unicode data
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~315
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d75c35e9de8f91afb2a7d5d024038575117e0e43;p=openldap

Use hardcoded Unicode data
---

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index 91a60bfb71..6cd9a228af 100644
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -16,7 +16,7 @@
 LIBRARY = liblunicode.a
 
 XXDIR = $(srcdir)/*/
-XXHEADERS = ucdata.h ure.h
+XXHEADERS = ucdata.h ure.h uctable.h
 
 XXSRCS	= ucdata.c ucgendat.c ure.c urestubs.c
 SRCS	= ucstr.c
@@ -24,23 +24,26 @@ OBJS	= ucdata.o ure.o urestubs.o ucstr.o
 
 XLIB = $(LIBRARY)
 XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
-PROGRAMS = ucgendat
+#PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
+uctable.h: $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
+	$(MAKE) ucgendat
+	./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
+
 ucgendat: $(XLIBS) ucgendat.o
 	$(LTLINK) -o $@ ucgendat.o $(LIBS)
-	./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
 
-DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat kdecomp.dat
+#DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat kdecomp.dat
 
-install-local: $(PROGRAMS) FORCE
-	-$(MKDIR) $(DESTDIR)$(datadir)/ucdata
-	@for i in $(DATFILES); do \
-		echo $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
-		$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
-	done
+#install-local: $(PROGRAMS) FORCE
+#	-$(MKDIR) $(DESTDIR)$(datadir)/ucdata
+#	@for i in $(DATFILES); do \
+#		echo $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
+#		$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
+#	done
 
 .links :
 	@for i in $(XXSRCS) $(XXHEADERS); do \
@@ -52,6 +55,6 @@ install-local: $(PROGRAMS) FORCE
 $(XXSRCS) : .links
 
 clean-local: FORCE
-	@$(RM) *.dat .links $(XXHEADERS)
+	@$(RM) *.dat .links $(XXHEADERS) ucgendat
 
 depend-common: .links