From 889e146f0dada015bf94f3696d03b5c48f53cf2a Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vitor@localhost.localdomain>
Date: Sun, 27 Mar 2011 13:14:42 +0100
Subject: [PATCH] update packages fix tai loading bug (now compile tai
 libraries in binary).

---
 Makefile.in   | 12 ++++++++----
 packages/YapR |  2 +-
 packages/sgml |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index dea2b5614..67a20ae78 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,7 +388,7 @@ BEAM_OBJECTS = \
 STATIC_OBJECTS = \
 	@STATIC_MODE@sys.o yap_random.o regexp.o  @NO_BUILTIN_REGEXP@ regcomp.o regerror.o regfree.o regexec.o
 
-LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS)
+LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS) $(LIBTAI_OBJECTS)
 
 OBJECTS = yap.o $(LIB_OBJECTS)
 
@@ -639,12 +639,16 @@ pl-yap.o: $(srcdir)/packages/PLStream/pl-yap.c config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-yap.c -o $@
 
 pl-tai.o: $(srcdir)/packages/PLStream/pl-tai.c config.h
-	( cd packages/PLStream/libtai ; make )
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/packages/PLStream/pl-tai.c -o $@
 
 uxnt.o: $(srcdir)/packages/PLStream/windows/uxnt.c config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/windows/uxnt.c -o $@
 
+# libtai rule
+%.o : $(srcdir)/packages/PLStream/libtai/%.c config.h
+	$(CC) -c $(CFLAGS) $< -o $@
+
+
 # default rule
 %.o : $(srcdir)/C/%.c config.h
 	$(CC) -c $(CFLAGS) $< -o $@
@@ -704,11 +708,11 @@ pl-yap@EXEC_SUFFIX@: $(PLCONS_OBJECTS) LGPL/swi_console/plterm.dll packages/PLST
 
 libYap.a: $(LIB_OBJECTS) 
 	-rm -f libYap.a
-	$(AR) rc libYap.a $(addprefix packages/PLStream/libtai/,$(LIBTAI_OBJECTS)) $(LIB_OBJECTS)
+	$(AR) rc libYap.a $(LIB_OBJECTS)
 	$(RANLIB) libYap.a
 
 @DYNYAPLIB@: $(LIB_OBJECTS)
-	@YAPLIB_LD@ -o @YAPLIB@ packages/PLStream/libtai/libtai.a $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG)
+	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG)
 
 install: install_bin install_data
 
diff --git a/packages/YapR b/packages/YapR
index c9d945820..1a0d65780 160000
--- a/packages/YapR
+++ b/packages/YapR
@@ -1 +1 @@
-Subproject commit c9d945820be9d1a9d6bc3e216721668f6b311feb
+Subproject commit 1a0d65780320ecb052c13efe49cbbfcdaa55ea83
diff --git a/packages/sgml b/packages/sgml
index 652ce8786..1be7f59f9 160000
--- a/packages/sgml
+++ b/packages/sgml
@@ -1 +1 @@
-Subproject commit 652ce8786dfd16f852ef3a30d0365f11375e160f
+Subproject commit 1be7f59f9950258f3542d4426c87340994e3edf6