ITS#6933

[openldap] / libraries / liblunicode / Makefile.in

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index e91dcd60ccda607c29583c74fec18d2738034ad5..c3ee1809cf8e064b527796fdcee08725cadc62f1 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 
 LIBRARY = liblunicode.a
 
-XXDIR = $(srcdir)/*/
+XXDIR = $(srcdir)/ucdata/
 XXHEADERS = ucdata.h ure.h uctable.h
 
 XXSRCS = ucdata.c ucgendat.c ure.c urestubs.c
@@ -23,36 +23,30 @@ SRCS        = ucstr.c
 OBJS   = ucdata.o ure.o urestubs.o ucstr.o
 
 XLIB = $(LIBRARY)
-XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
+XLIBS = $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
 #PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-uctable.h: ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
+uctable.h: $(XXDIR)/uctable.h
+
+$(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c $(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)
 
-#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
-
 .links :
        @for i in $(XXSRCS) $(XXHEADERS); do \
                $(RM) $$i ; \
-               $(LN_S) $(XXDIR)$$i . ; \
+               ii=`find $(srcdir) -name $$i` ; \
+               $(LN_S) $$ii . ; \
        done
        touch .links
 
-$(XXSRCS) : .links
+$(XXSRCS) $(XXHEADERS) : .links
 
 clean-local: FORCE
        @$(RM) *.dat .links $(XXHEADERS) ucgendat