[SCM] Seamless communication between many kinds of Unix branch, master, updated. edcf51c73dddd14838f0b57666677f8a354c04bd

[Ole Streicher]

The following commit has been merged in the master branch:
commit b8eff0fa445b87df812f2c48f314f007661d9069
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 3 15:56:52 2012 +0100

    Dont include all objects in libtclxpa.so; link to libtxl.so instead.

diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index 61aa345..8650503 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -1,9 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  Debians policy.
---- xpa-2.1.13.orig/Makefile.in
-+++ xpa-2.1.13/Makefile.in
-@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,6 +38,7 @@ INSTALL_ROOT =
  
  # Directory in which to install the .a or .so binary for the XPA library:
  LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
@@ -11,6 +11,15 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  
  # Directory in which to install the program wish:
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+@@ -142,7 +143,7 @@ GTK_OBJS =	gtkloop.o
+ INCL	=	xpa.h xpap.h
+ 
+ # these are all the modules going into the "normal" xpa library
+-LIBOBJS =	${BASE_OBJS} ${TCL_OBJS} ${XT_OBJS} ${GTK_OBJS}
++LIBOBJS =	${BASE_OBJS} ${XT_OBJS} ${GTK_OBJS}
+ LIB =	libxpa.a
+ 
+ # used in link line
 @@ -167,6 +168,8 @@ install::	install-man
  
  install::	install-share
@@ -20,7 +29,37 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  lib:		$(LIB) $(DOSHARED)
  
  $(LIB):		$(LIBOBJS)
-@@ -257,7 +260,7 @@ smoke:  ctest stest
+@@ -191,14 +194,21 @@ mingw-dll:	$(LIBOBJS)
+ 		-e _LibMain at 12 -Wl,--image-base,0x1C000000 -o libxpa.dll \
+ 		-luser32 -lwsock32
+ 
+-tclxpa:		$(LIB)
+-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+-		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
+-		rm -f libtclxpa.tmp/xt*.o; \
+-		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \
+-		test -r libtclxpa.dylib && cp -p libtclxpa.dylib libtclxpa.so && echo "copying libtclxpa.dylib to libtclxpa.so"; \
+-		rm -rf libtclxpa.tmp)
++
++tclxpa:		$(TCL_OBJS) 
++		ar cruv libtclxpa.a $(TCL_OBJS)
++		$(RANLIB) libtclxpa.a
++
++shtclxpa:	tclxpa
++		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
++		CC='$(CC)' CXX='$(CXX)' \
++		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		rm -rf $(PACKAGE)tmp; \
++		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
++		SHLIB=libtclxpa.so; \
++		test -r libtclxpa.dylib && SHLIB=libtclxpa.dylib; \
++		echo "pkg_mkIndex -direct . $${SHLIB}; exit" | tclsh;)
+ 
+ diff:
+ 		-(for f in `ls *.c`;					\
+@@ -257,7 +267,7 @@ smoke:  ctest stest
  _install:
  
  shlib_install:
@@ -29,11 +68,11 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  	   do \
  	   if [ -h $$i ] ; then \
  		echo "Installing link $$i" ; \
-@@ -269,6 +272,11 @@ shlib_install:
+@@ -269,6 +279,11 @@ shlib_install:
  	   fi; \
  	   done;)
  
-+tclxpa_install: tclxpa
++tclxpa_install: shtclxpa
 +	mkdir -p $(TCL_LIB_INSTALL_DIR)
 +	$(INSTALL_DATA) libtclxpa.so $(TCL_LIB_INSTALL_DIR)
 +	$(INSTALL_DATA) pkgIndex.tcl $(TCL_LIB_INSTALL_DIR)

-- 
Seamless communication between many kinds of Unix