? TODO-rob.txt
? abiword-libtool.diff
? abiword-missing-tools.diff
? removed-strings.txt
? version.m4-away
? ac-helpers/compile
? src/af/ev/unix/combo
? src/af/ev/unix/combo.c
? src/af/ev/unix/ev_UnixStockIcons.cpp
? src/af/ev/unix/ev_UnixStockIcons.h
? src/af/ev/unix/foo.c
? src/af/ev/unix/test
Index: autogen.sh
===================================================================
RCS file: /cvsroot/abi/autogen.sh,v
retrieving revision 1.21
diff -u -r1.21 autogen.sh
--- autogen.sh	13 Sep 2006 19:59:28 -0000	1.21
+++ autogen.sh	21 Nov 2006 22:23:19 -0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # 
 # Run this before configure
 #
@@ -16,6 +16,21 @@
 
 pushd $srcdir
 
+# Setup libtool
+# 
+echo "Seting up libtool: $LIBTOOLIZE --force --copy"
+
+if test "x`uname`" = "xDarwin"; then
+    LIBTOOLIZE=glibtoolize
+else
+    LIBTOOLIZE=libtoolize
+fi
+
+$LIBTOOLIZE --force --copy || {
+    echo "error: libtoolize failed"
+    exit 1
+}
+
 automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
 
 if [ $? -ne 0 ]; then
Index: configure.ac
===================================================================
RCS file: /cvsroot/abi/configure.ac,v
retrieving revision 1.193
diff -u -r1.193 configure.ac
--- configure.ac	3 Oct 2006 02:41:31 -0000	1.193
+++ configure.ac	21 Nov 2006 22:23:19 -0000
@@ -59,8 +59,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-dnl AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AM_ACLOCAL_INCLUDE(ac-helpers)
 
 dnl Detect our platform (unix, win32, etc)
Index: includes.mk
===================================================================
RCS file: /cvsroot/abi/includes.mk,v
retrieving revision 1.64
diff -u -r1.64 includes.mk
--- includes.mk	2 Oct 2006 21:17:13 -0000	1.64
+++ includes.mk	21 Nov 2006 22:23:19 -0000
@@ -162,11 +162,11 @@
 ABI_TEST_LIBS+=$(top_builddir)/src/af/xap/libTestXap.a
 
 if WITH_HILDON
-ABI_HILDON_OBJECTS=xp/*.o @PLATFORM@/*.o @PLATFORM@/hildon/*.o
+ABI_HILDON_OBJECTS=xp/*.lo @PLATFORM@/*.lo @PLATFORM@/hildon/*.lo
 endif
 
-ABI_OBJECTS=xp/*.o @PLATFORM@/*.o 
-ABI_TEST_OBJECTS=xp/t/*.o 
+ABI_OBJECTS=xp/*.lo @PLATFORM@/*.lo 
+ABI_TEST_OBJECTS=xp/t/*.lo 
 #@PLATFORM@/t/*.o 
 
 SUFFIXES=.mm
Index: goffice-bits/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/goffice-bits/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- goffice-bits/GNUmakefile.am	12 Sep 2006 22:07:31 -0000	1.1
+++ goffice-bits/GNUmakefile.am	21 Nov 2006 22:23:19 -0000
@@ -1,11 +1,11 @@
 
-noinst_LIBRARIES = libgoffice.a
+noinst_LTLIBRARIES = libgoffice.la
 
-libgoffice_a_CPPFLAGS = \
+libgoffice_la_CPPFLAGS = \
 	$(GTK_CFLAGS)		\
 	$(GSF_CFLAGS)
 
-libgoffice_a_SOURCES = 					\
+libgoffice_la_SOURCES = 					\
 	goffice/goffice-config.h			\
 	goffice/goffice-features.h			\
 	goffice/goffice-priv.h				\
Index: src/af/ev/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/GNUmakefile.am,v
retrieving revision 1.6
diff -u -r1.6 GNUmakefile.am
--- src/af/ev/GNUmakefile.am	2 Oct 2006 21:17:15 -0000	1.6
+++ src/af/ev/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,10 +20,10 @@
 
 SUBDIRS = xp @PLATFORM@
 
-noinst_LIBRARIES= libEv.a
+noinst_LTLIBRARIES= libEv.la
 
 objects = $(ABI_OBJECTS)
 
-libEv_a_SOURCES = 
+libEv_la_SOURCES = 
 
-libEv_a_LIBADD = $(objects)
+libEv_la_LIBADD = $(objects)
Index: src/af/ev/cocoa/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/cocoa/GNUmakefile.am,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile.am
--- src/af/ev/cocoa/GNUmakefile.am	18 Dec 2001 21:07:34 -0000	1.2
+++ src/af/ev/cocoa/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 
 INCLUDES= $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES)	
 
-noinst_LIBRARIES = libEv_cocoa.a
+noinst_LTLIBRARIES = libEv_cocoa.la
 
-libEv_cocoa_a_SOURCES=		\
+libEv_cocoa_la_SOURCES=		\
 	 ev_CocoaKeyboard.mm		\
 	 ev_CocoaMenu.mm		\
 	 ev_CocoaMouse.mm		\
Index: src/af/ev/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/qnx/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/af/ev/qnx/GNUmakefile.am	27 Mar 2002 08:07:46 -0000	1.1
+++ src/af/ev/qnx/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 INCLUDES= @GTK_CFLAGS@ @GMODULE_CFLAGS@ \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libEv_qnx.a
+noinst_LTLIBRARIES = libEv_qnx.la
 
-libEv_qnx_a_SOURCES=		\
+libEv_qnx_la_SOURCES=		\
 	 ev_QNXKeyboard.cpp		\
 	 ev_QNXMenu.cpp		\
 	 ev_QNXMouse.cpp		\
Index: src/af/ev/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/unix/GNUmakefile.am,v
retrieving revision 1.12
diff -u -r1.12 GNUmakefile.am
--- src/af/ev/unix/GNUmakefile.am	19 Sep 2006 00:31:57 -0000	1.12
+++ src/af/ev/unix/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -28,9 +28,9 @@
 	$(TEXT_INCLUDES) 	\
 	$(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libEv_unix.a
+noinst_LTLIBRARIES = libEv_unix.la
 
-libEv_unix_a_SOURCES=			\
+libEv_unix_la_SOURCES=			\
 	abi-font-combo.c		\
 	ev_UnixKeyboard.cpp		\
 	ev_UnixMenu.cpp			\
Index: src/af/ev/unix/gnome/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/unix/gnome/GNUmakefile.am,v
retrieving revision 1.7
diff -u -r1.7 GNUmakefile.am
--- src/af/ev/unix/gnome/GNUmakefile.am	2 Oct 2006 21:17:16 -0000	1.7
+++ src/af/ev/unix/gnome/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -25,9 +25,9 @@
 INCLUDES= @GTK_CFLAGS@ @GMODULE_CFLAGS@ \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libEv_gnome.a
+noinst_LTLIBRARIES = libEv_gnome.la
 
-libEv_gnome_a_SOURCES=		\
+libEv_gnome_la_SOURCES=		\
 		ev_GnomeToolbar.cpp
 
 endif
Index: src/af/ev/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/win/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/af/ev/win/GNUmakefile.am	12 Apr 2003 14:48:12 -0000	1.1
+++ src/af/ev/win/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 INCLUDES= $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES)
 
 
-noinst_LIBRARIES = libEv_win.a
+noinst_LTLIBRARIES = libEv_win.la
 
-libEv_win_a_SOURCES=		\
+libEv_win_la_SOURCES=		\
 	 ev_Win32Keyboard.cpp		\
 	 ev_Win32Menu.cpp		\
 	 ev_Win32Mouse.cpp		\
Index: src/af/ev/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/ev/xp/GNUmakefile.am,v
retrieving revision 1.4
diff -u -r1.4 GNUmakefile.am
--- src/af/ev/xp/GNUmakefile.am	14 Dec 2001 08:20:34 -0000	1.4
+++ src/af/ev/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= $(AF_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libEv_xp.a
+noinst_LTLIBRARIES = libEv_xp.la
 
-libEv_xp_a_SOURCES=	\
+libEv_xp_la_SOURCES=	\
 	ev_EditBinding.cpp	\
 	ev_EditEventMapper.cpp	\
 	ev_EditMethod.cpp	\
Index: src/af/gr/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/af/gr/GNUmakefile.am	29 Oct 2001 13:52:02 -0000	1.3
+++ src/af/gr/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,8 +20,8 @@
 
 SUBDIRS= xp @PLATFORM@
 
-noinst_LIBRARIES= libGr.a
+noinst_LTLIBRARIES= libGr.la
 
-libGr_a_SOURCES = 
+libGr_la_SOURCES = 
 
-libGr_a_LIBADD = $(ABI_OBJECTS)
+libGr_la_LIBADD = $(ABI_OBJECTS)
Index: src/af/gr/cocoa/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/cocoa/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/af/gr/cocoa/GNUmakefile.am	29 Nov 2001 23:57:22 -0000	1.1
+++ src/af/gr/cocoa/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -22,8 +22,8 @@
 	$(AF_INCLUDES) $(ICONV_INCLUDES)
 
 
-noinst_LIBRARIES = libGr_cocoa.a
+noinst_LTLIBRARIES = libGr_cocoa.la
 
-libGr_cocoa_a_SOURCES=\
+libGr_cocoa_la_SOURCES=\
 	gr_CocoaGraphics.mm	\
 	gr_CocoaImage.mm
Index: src/af/gr/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/qnx/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/af/gr/qnx/GNUmakefile.am	27 Mar 2002 08:07:54 -0000	1.1
+++ src/af/gr/qnx/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 
 INCLUDES = $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libGr_qnx.a
+noinst_LTLIBRARIES = libGr_qnx.la
 
-libGr_qnx_a_SOURCES=		\
+libGr_qnx_la_SOURCES=		\
 	 gr_QNXGraphics.cpp		\
 	 gr_QNXImage.cpp
 
Index: src/af/gr/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/unix/GNUmakefile.am,v
retrieving revision 1.12
diff -u -r1.12 GNUmakefile.am
--- src/af/gr/unix/GNUmakefile.am	2 Sep 2006 09:22:48 -0000	1.12
+++ src/af/gr/unix/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,7 +20,7 @@
 
 INCLUDES= @GTK_CFLAGS@ @GMODULE_CFLAGS@ $(AF_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libGr_unix.a
+noinst_LTLIBRARIES = libGr_unix.la
 
 if WITH_PANGO
 pango_src = gr_UnixPangoGraphics.cpp
@@ -28,7 +28,7 @@
 pango_src =
 endif
 
-libGr_unix_a_SOURCES= $(pango_src)              \
+libGr_unix_la_SOURCES= $(pango_src)              \
 	              gr_UnixGraphics.cpp	\
 	              gr_UnixImage.cpp
 
Index: src/af/gr/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/win/GNUmakefile.am,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile.am
--- src/af/gr/win/GNUmakefile.am	22 Feb 2004 09:21:01 -0000	1.2
+++ src/af/gr/win/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= $(AF_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libGr_win.a
+noinst_LTLIBRARIES = libGr_win.la
 
-libGr_win_a_SOURCES=\
+libGr_win_la_SOURCES=\
 	gr_Win32CharWidths.cpp  \
 	gr_Win32Graphics.cpp	\
 	gr_Win32Image.cpp       \
Index: src/af/gr/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/gr/xp/GNUmakefile.am,v
retrieving revision 1.12
diff -u -r1.12 GNUmakefile.am
--- src/af/gr/xp/GNUmakefile.am	4 Dec 2005 09:32:36 -0000	1.12
+++ src/af/gr/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES = $(AF_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libGr_xp.a
+noinst_LTLIBRARIES = libGr_xp.la
 
-libGr_xp_a_SOURCES=\
+libGr_xp_la_SOURCES=\
 	gr_CharWidths.cpp		\
 	gr_CharWidthsCache.cpp		\
 	gr_DrawArgs.cpp			\
Index: src/af/tf/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/tf/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/af/tf/GNUmakefile.am	13 Sep 2006 13:08:44 -0000	1.3
+++ src/af/tf/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -25,4 +25,3 @@
 libTF_a_SOURCES = 
 
 libTF_a_LIBADD = $(ABI_OBJECTS) 
-
Index: src/af/tf/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/tf/xp/GNUmakefile.am,v
retrieving revision 1.4
diff -u -r1.4 GNUmakefile.am
--- src/af/tf/xp/GNUmakefile.am	20 May 2006 14:50:54 -0000	1.4
+++ src/af/tf/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -30,4 +30,4 @@
 #       when valgrind is enabled
 CXXFLAGS+=-Wno-long-long 
 
-libTF_xp_a_SOURCES= tf_test.cpp
+libTF_xp_la_SOURCES= tf_test.cpp
Index: src/af/util/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/GNUmakefile.am,v
retrieving revision 1.6
diff -u -r1.6 GNUmakefile.am
--- src/af/util/GNUmakefile.am	12 Jan 2005 20:55:27 -0000	1.6
+++ src/af/util/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -27,12 +27,12 @@
 
 SUBDIRS = xp @BE_PLATFORM@
 
-noinst_LIBRARIES = libUtil.a 
+noinst_LTLIBRARIES = libUtil.la 
 check_LIBRARIES = libTestUtil.a
 
-libUtil_a_SOURCES = 
+libUtil_la_SOURCES = 
 
-libUtil_a_LIBADD = $(ABI_BE_OBJECTS)
+libUtil_la_LIBADD = $(ABI_BE_OBJECTS)
 
 libTestUtil_a_SOURCES =
 
Index: src/af/util/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/qnx/GNUmakefile.am,v
retrieving revision 1.4
diff -u -r1.4 GNUmakefile.am
--- src/af/util/qnx/GNUmakefile.am	22 Feb 2004 14:46:57 -0000	1.4
+++ src/af/util/qnx/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 
 INCLUDES= $(AF_INCLUDES) -I../unix
 
-noinst_LIBRARIES = libUtil_qnx.a
+noinst_LTLIBRARIES = libUtil_qnx.la
 
-libUtil_qnx_a_SOURCES=		\
+libUtil_qnx_la_SOURCES=		\
 	ut_qnxString.cpp    \
 	ut_Xpm2Bitmap.cpp      \
 	ut_qnxTimer.cpp     \
Index: src/af/util/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/unix/GNUmakefile.am,v
retrieving revision 1.8
diff -u -r1.8 GNUmakefile.am
--- src/af/util/unix/GNUmakefile.am	24 Jan 2004 16:43:35 -0000	1.8
+++ src/af/util/unix/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= @GMODULE_CFLAGS@ @GTK_CFLAGS@ $(AF_INCLUDES)
 
-noinst_LIBRARIES = libUtil_unix.a
+noinst_LTLIBRARIES = libUtil_unix.la
 
-libUtil_unix_a_SOURCES=\
+libUtil_unix_la_SOURCES=\
 	ut_debugmsg.cpp		\
 	ut_files.cpp		\
 	ut_unixAssert.cpp	\
Index: src/af/util/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/af/util/win/GNUmakefile.am	20 Jul 2005 13:20:53 -0000	1.3
+++ src/af/util/win/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= $(AF_INCLUDES)
 
-noinst_LIBRARIES = libUtil_win.a
+noinst_LTLIBRARIES = libUtil_win.la
 
-libUtil_win_a_SOURCES=\
+libUtil_win_la_SOURCES=\
 	ut_debugmsg.cpp		\
 	ut_Win32OS.cpp		\
 	ut_Win32String.cpp	\
Index: src/af/util/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/GNUmakefile.am,v
retrieving revision 1.38
diff -u -r1.38 GNUmakefile.am
--- src/af/util/xp/GNUmakefile.am	29 Jul 2006 16:54:29 -0000	1.38
+++ src/af/util/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,7 +20,7 @@
 
 INCLUDES= $(AF_INCLUDES) $(OTHER_INCLUDES) $(ICONV_INCLUDES) $(LIBPNG_INCLUDES)
 
-noinst_LIBRARIES = libUtil_xp.a
+noinst_LTLIBRARIES = libUtil_xp.la
 
 if SCRIPT
 SCRIPT_OBJ=ut_PerlBindings.cpp
@@ -38,7 +38,7 @@
 
 SUBDIRS = t
 
-libUtil_xp_a_SOURCES=\
+libUtil_xp_la_SOURCES=\
 	ut_AdobeEncoding.cpp 	\
 	ut_allocator.cpp	\
 	ut_base64.cpp		\
Index: src/af/util/xp/t/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/t/GNUmakefile.am,v
retrieving revision 1.6
diff -u -r1.6 GNUmakefile.am
--- src/af/util/xp/t/GNUmakefile.am	15 Oct 2005 19:38:29 -0000	1.6
+++ src/af/util/xp/t/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -22,7 +22,7 @@
 
 check_LIBRARIES = libTestUtil_xp.a
 
-libTestUtil_xp_a_SOURCES=\
+libTestUtil_xp_la_SOURCES=\
 	ut_bytebuf.t.cpp \
 	ut_locale.t.cpp \
 	ut_map.t.cpp \
Index: src/af/xap/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/GNUmakefile.am,v
retrieving revision 1.9
diff -u -r1.9 GNUmakefile.am
--- src/af/xap/GNUmakefile.am	12 Sep 2006 22:07:41 -0000	1.9
+++ src/af/xap/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,7 +21,7 @@
 
 SUBDIRS = xp @PLATFORM@
 
-noinst_LIBRARIES= libXap.a
+noinst_LTLIBRARIES= libXap.la
 check_LIBRARIES = libTestXap.a 
 
 if WITH_HILDON
@@ -30,9 +30,9 @@
 objects = $(ABI_OBJECTS)
 endif
 
-libXap_a_SOURCES = 
+libXap_la_SOURCES = 
 
-libXap_a_LIBADD = $(objects) 
+libXap_la_LIBADD = $(objects) 
 
 libTestXap_a_SOURCES =
 
Index: src/af/xap/cocoa/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/cocoa/GNUmakefile.am,v
retrieving revision 1.23
diff -u -r1.23 GNUmakefile.am
--- src/af/xap/cocoa/GNUmakefile.am	15 Mar 2005 02:44:04 -0000	1.23
+++ src/af/xap/cocoa/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -21,9 +21,9 @@
 
 INCLUDES= @GLIB_CFLAGS@ $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libXap_cocoa.a
+noinst_LTLIBRARIES = libXap_cocoa.la
 
-libXap_cocoa_a_SOURCES =		\
+libXap_cocoa_la_SOURCES =		\
 	xap_CocoaApp.mm			\
 	xap_CocoaAppImpl.mm		\
 	xap_CocoaAppController.mm	\
Index: src/af/xap/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/qnx/GNUmakefile.am,v
retrieving revision 1.5
diff -u -r1.5 GNUmakefile.am
--- src/af/xap/qnx/GNUmakefile.am	6 Feb 2004 19:04:26 -0000	1.5
+++ src/af/xap/qnx/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libXap_qnx.a
+noinst_LTLIBRARIES = libXap_qnx.la
 
-libXap_qnx_a_SOURCES=		\
+libXap_qnx_la_SOURCES=		\
 	xap_QNXApp.cpp                          \
 	xap_QNXAppImpl.cpp                      \
 	xap_QNXClipboard.cpp	\
Index: src/af/xap/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/GNUmakefile.am,v
retrieving revision 1.51
diff -u -r1.51 GNUmakefile.am
--- src/af/xap/unix/GNUmakefile.am	16 Sep 2006 00:22:09 -0000	1.51
+++ src/af/xap/unix/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -38,7 +38,7 @@
 	$(OTHER_INCLUDES)	\
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" 
 
-noinst_LIBRARIES = libXap_unix.a
+noinst_LTLIBRARIES = libXap_unix.la
 
 gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
 
@@ -67,7 +67,7 @@
 	xap_UnixDlg_DocComparison.glade \
 	xap_UnixDlg_ListDocuments.glade
 
-libXap_unix_a_SOURCES= $(print_src)	\
+libXap_unix_la_SOURCES= $(print_src)	\
 	xap_UnixApp.cpp					\
 	xap_UnixAppImpl.cpp				\
 	xap_UnixClipboard.cpp			\
Index: src/af/xap/unix/hildon/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/hildon/GNUmakefile.am,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile.am
--- src/af/xap/unix/hildon/GNUmakefile.am	5 Jul 2005 21:48:05 -0000	1.2
+++ src/af/xap/unix/hildon/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -22,8 +22,8 @@
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES) $(HILDON_CFLAGS)
 
-noinst_LIBRARIES = libXap_hildon.a
+noinst_LTLIBRARIES = libXap_hildon.la
 
-libXap_hildon_a_SOURCES=\
+libXap_hildon_la_SOURCES=\
 	xap_UnixHildonDlg_FontChooser.cpp \
 	xap_UnixHildonApp.cpp
Index: src/af/xap/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/GNUmakefile.am,v
retrieving revision 1.5
diff -u -r1.5 GNUmakefile.am
--- src/af/xap/win/GNUmakefile.am	20 Jul 2005 13:22:17 -0000	1.5
+++ src/af/xap/win/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -22,10 +22,10 @@
 INCLUDES= -UVERSION \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libXap_win.a
+noinst_LTLIBRARIES = libXap_win.la
 
 
-libXap_win_a_SOURCES=\
+libXap_win_la_SOURCES=\
 	xap_Win32App.cpp			\
 	xap_Win32AppImpl.cpp			\
 	xap_Win32Clipboard.cpp			\
Index: src/af/xap/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/xp/GNUmakefile.am,v
retrieving revision 1.32
diff -u -r1.32 GNUmakefile.am
--- src/af/xap/xp/GNUmakefile.am	30 Jan 2006 12:57:11 -0000	1.32
+++ src/af/xap/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -26,7 +26,7 @@
 RESOURCE_MANAGER_OBJ = 
 endif
 
-noinst_LIBRARIES = libXap_xp.a
+noinst_LTLIBRARIES = libXap_xp.la
 
 if WITH_PRINTING
 print_src = xap_Dlg_Print.cpp	\
@@ -35,7 +35,7 @@
 print_src =
 endif
 
-libXap_xp_a_SOURCES= $(print_src) \
+libXap_xp_la_SOURCES= $(print_src) \
 	xad_Document.cpp		\
 	xap_App.cpp			\
 	xap_AppImpl.cpp                  \
Index: src/bindings/perl/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/bindings/perl/GNUmakefile.am,v
retrieving revision 1.5
diff -u -r1.5 GNUmakefile.am
--- src/bindings/perl/GNUmakefile.am	7 Sep 2004 20:48:38 -0000	1.5
+++ src/bindings/perl/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -7,9 +7,9 @@
 
 include $(top_srcdir)/includes.mk
 
-noinst_LIBRARIES = libabiperl.a
+noinst_LTLIBRARIES = libabiperl.la
 
-libabiperl_a_SOURCES = AbiWord.cpp
+libabiperl_la_SOURCES = AbiWord.cpp
 BUILT_SOURCES = AbiWord.cpp
 
 perldir = $(top_builddir)/src/bindings/perl
Index: src/other/spell/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/other/spell/xp/GNUmakefile.am,v
retrieving revision 1.10
diff -u -r1.10 GNUmakefile.am
--- src/other/spell/xp/GNUmakefile.am	3 Oct 2003 02:53:23 -0000	1.10
+++ src/other/spell/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,7 +20,7 @@
 
 INCLUDES = $(AF_INCLUDES) $(WP_INCLUDES) $(ICONV_INCLUDES) @SPELL_CFLAGS@
 
-noinst_LIBRARIES = libSpell.a
+noinst_LTLIBRARIES = libSpell.la
 
 COMMONSOURCES = spell_manager.cpp barbarisms.cpp
 
@@ -36,4 +36,4 @@
 ISPELLSOURCES = 
 endif
 
-libSpell_a_SOURCES = $(COMMONSOURCES) $(ENCHANTSOURCES) $(ISPELLSOURCES)
+libSpell_la_SOURCES = $(COMMONSOURCES) $(ENCHANTSOURCES) $(ISPELLSOURCES)
Index: src/other/ttftool/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/other/ttftool/unix/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/other/ttftool/unix/GNUmakefile.am	15 Jul 2002 17:48:32 -0000	1.1
+++ src/other/ttftool/unix/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,6 +20,6 @@
 
 INCLUDES = $(AF_INCLUDES) $(ICONV_INCLUDES) 
 
-noinst_LIBRARIES = libTtfTool.a
+noinst_LTLIBRARIES = libTtfTool.la
 
-libTtfTool_a_SOURCES = parse.c ps.c ttfutils.c
+libTtfTool_la_SOURCES = parse.c ps.c ttfutils.c
Index: src/pkg/linux/apkg/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/pkg/linux/apkg/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/pkg/linux/apkg/GNUmakefile.am	4 May 2005 18:22:03 -0000	1.1
+++ src/pkg/linux/apkg/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -18,7 +18,7 @@
 
 include $(top_srcdir)/includes.mk
 
-noinst_LIBRARIES = libApkg.a
+noinst_LTLIBRARIES = libApkg.la
 
-libApkg_a_SOURCES=\
+libApkg_la_SOURCES=\
 	prefix.c
Index: src/text/fmt/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/text/fmt/xp/GNUmakefile.am,v
retrieving revision 1.28
diff -u -r1.28 GNUmakefile.am
--- src/text/fmt/xp/GNUmakefile.am	19 Mar 2005 12:02:35 -0000	1.28
+++ src/text/fmt/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -20,9 +20,9 @@
 
 INCLUDES= $(TEXT_INCLUDES) $(WP_INCLUDES) $(AF_INCLUDES) $(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libFmt.a
+noinst_LTLIBRARIES = libFmt.la
 
-libFmt_a_SOURCES= \
+libFmt_la_SOURCES= \
 	fv_View.cpp			\
 	fv_View_cmd.cpp			\
 	fv_View_protected.cpp			\
Index: src/text/fmt/xp/t/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/text/fmt/xp/t/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/text/fmt/xp/t/GNUmakefile.am	4 Feb 2006 03:38:21 -0000	1.1
+++ src/text/fmt/xp/t/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -23,5 +23,5 @@
 
 check_LIBRARIES = libTestFmt.a
 
-libTestFmt_a_SOURCES= \
+libTestFmt_la_SOURCES= \
 	fl_BlockLayout.t.cpp
\ No newline at end of file
Index: src/text/ptbl/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/text/ptbl/xp/GNUmakefile.am,v
retrieving revision 1.10
diff -u -r1.10 GNUmakefile.am
--- src/text/ptbl/xp/GNUmakefile.am	8 Jul 2006 14:06:11 -0000	1.10
+++ src/text/ptbl/xp/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -22,9 +22,9 @@
 
 SUBDIRS = t
 
-noinst_LIBRARIES = libPtbl.a 
+noinst_LTLIBRARIES = libPtbl.la
 
-libPtbl_a_SOURCES= \
+libPtbl_la_SOURCES= \
 	pd_Document.cpp			\
 	pd_Document_TestRoutines.cpp	\
 	pd_Style.cpp			\
Index: src/text/ptbl/xp/t/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/text/ptbl/xp/t/GNUmakefile.am,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile.am
--- src/text/ptbl/xp/t/GNUmakefile.am	12 Jan 2005 20:55:27 -0000	1.2
+++ src/text/ptbl/xp/t/GNUmakefile.am	21 Nov 2006 22:23:20 -0000
@@ -24,4 +24,4 @@
 check_LIBRARIES = libTestPtbl.a
 
 libTestPtbl_a_SOURCES= \
-	pt_PieceTable.t.cpp
\ No newline at end of file
+	pt_PieceTable.t.cpp
Index: src/wp/ap/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/GNUmakefile.am,v
retrieving revision 1.6
diff -u -r1.6 GNUmakefile.am
--- src/wp/ap/GNUmakefile.am	2 Oct 2006 21:17:17 -0000	1.6
+++ src/wp/ap/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -20,7 +20,7 @@
 
 SUBDIRS= xp @PLATFORM@
 
-noinst_LIBRARIES= libAp.a
+noinst_LTLIBRARIES= libAp.la
 
 if WITH_HILDON
 objects = $(ABI_OBJECTS) $(ABI_HILDON_OBJECTS)
@@ -28,6 +28,6 @@
 objects = $(ABI_OBJECTS)
 endif
 
-libAp_a_SOURCES = 
+libAp_la_SOURCES = 
 
-libAp_a_LIBADD = $(objects) 
+libAp_la_LIBADD = $(objects) 
Index: src/wp/ap/cocoa/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/cocoa/GNUmakefile.am,v
retrieving revision 1.25
diff -u -r1.25 GNUmakefile.am
--- src/wp/ap/cocoa/GNUmakefile.am	15 Mar 2005 02:44:07 -0000	1.25
+++ src/wp/ap/cocoa/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -24,9 +24,9 @@
 	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
 	@GMODULE_CFLAGS@ $(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_cocoa.a
+noinst_LTLIBRARIES = libWpAp_cocoa.la
 
-libWpAp_cocoa_a_SOURCES=\
+libWpAp_cocoa_la_SOURCES=\
 	ap_CocoaApp.mm		\
 	ap_CocoaAppImpl.mm		\
 	ap_CocoaClipboard.mm	\
Index: src/wp/ap/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/qnx/GNUmakefile.am,v
retrieving revision 1.13
diff -u -r1.13 GNUmakefile.am
--- src/wp/ap/qnx/GNUmakefile.am	25 Feb 2004 04:17:42 -0000	1.13
+++ src/wp/ap/qnx/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -24,9 +24,9 @@
 	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
 	$(WV_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_qnx.a
+noinst_LTLIBRARIES = libWpAp_qnx.la
 
-libWpAp_qnx_a_SOURCES=\
+libWpAp_qnx_la_SOURCES=\
 	ap_@ABI_FE@App.cpp			\
 	ap_@ABI_FE@AppImpl.cpp			\
 	ap_@ABI_FE@ViewListener.cpp \
Index: src/wp/ap/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/GNUmakefile.am,v
retrieving revision 1.63
diff -u -r1.63 GNUmakefile.am
--- src/wp/ap/unix/GNUmakefile.am	2 Oct 2006 21:17:18 -0000	1.63
+++ src/wp/ap/unix/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -32,7 +32,7 @@
 	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_unix.a
+noinst_LTLIBRARIES = libWpAp_unix.la
 
 gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
 
@@ -65,7 +65,7 @@
 	ap_UnixDialog_Options.glade \
 	ap_UnixDialog_HdrFtr.glade
 
-libWpAp_unix_a_SOURCES=\
+libWpAp_unix_la_SOURCES=\
 	ap_@ABI_FE@App.cpp			\
 	ap_@ABI_FE@AppImpl.cpp			\
 	ap_@ABI_FE@Clipboard.cpp		\
Index: src/wp/ap/unix/gnome/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/gnome/GNUmakefile.am,v
retrieving revision 1.13
diff -u -r1.13 GNUmakefile.am
--- src/wp/ap/unix/gnome/GNUmakefile.am	2 Oct 2006 21:17:18 -0000	1.13
+++ src/wp/ap/unix/gnome/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -24,9 +24,9 @@
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES) \
 	@GNOMEVFS_CFLAGS@
 
-noinst_LIBRARIES = libWpAp_Gnome.a
+noinst_LTLIBRARIES = libWpAp_Gnome.la
 
-libWpAp_Gnome_a_SOURCES=\
+libWpAp_Gnome_la_SOURCES=\
 		ap_@ABI_FE@GnomeApp.cpp				\
 		ap_@ABI_FE@GnomeDialog_Break.cpp		\
 		ap_@ABI_FE@GnomeDialog_InsertTable.cpp		\
Index: src/wp/ap/unix/hildon/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/hildon/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/wp/ap/unix/hildon/GNUmakefile.am	5 Jul 2005 14:08:22 -0000	1.1
+++ src/wp/ap/unix/hildon/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -23,7 +23,7 @@
 	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
 	@HILDON_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_unixHildon.a
+noinst_LTLIBRARIES = libWpAp_unixHildon.la
 
 gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
 
@@ -31,6 +31,6 @@
 	ap_UnixHildonDialog_HdrFtr.glade \
 	ap_UnixHildonDialog_Options.glade
 
-libWpAp_unixHildon_a_SOURCES=\
+libWpAp_unixHildon_la_SOURCES=\
 	ap_@ABI_FE@HildonFrameImpl.cpp
 
Index: src/wp/ap/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/GNUmakefile.am,v
retrieving revision 1.4
diff -u -r1.4 GNUmakefile.am
--- src/wp/ap/win/GNUmakefile.am	16 Oct 2005 12:50:25 -0000	1.4
+++ src/wp/ap/win/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -29,9 +29,9 @@
 	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
 	$(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_win.a
+noinst_LTLIBRARIES = libWpAp_win.la
 
-libWpAp_win_a_SOURCES=\
+libWpAp_win_la_SOURCES=\
 	ap_@ABI_FE@App.cpp			\
 	ap_@ABI_FE@AppImpl.cpp			\
 	ap_@ABI_FE@Clipboard.cpp		\
Index: src/wp/ap/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/xp/GNUmakefile.am,v
retrieving revision 1.32
diff -u -r1.32 GNUmakefile.am
--- src/wp/ap/xp/GNUmakefile.am	27 Feb 2006 17:27:46 -0000	1.32
+++ src/wp/ap/xp/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -23,9 +23,9 @@
 INCLUDES= $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) \
 	  $(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
-noinst_LIBRARIES = libWpAp_xp.a
+noinst_LTLIBRARIES = libWpAp_xp.la
 
-libWpAp_xp_a_SOURCES=	ap_Args.cpp		\
+libWpAp_xp_la_SOURCES=	ap_Args.cpp		\
 		ap_Convert.cpp			\
 		ap_Dialog_Background.cpp	\
 		ap_Dialog_HdrFtr.cpp		\
Index: src/wp/impexp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/wp/impexp/GNUmakefile.am	23 Jan 2003 20:36:58 -0000	1.3
+++ src/wp/impexp/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -20,10 +20,10 @@
 
 SUBDIRS= xp @PLATFORM@
 
-noinst_LIBRARIES= libImpExp.a
+noinst_LTLIBRARIES= libImpExp.la
 
 objects = $(ABI_OBJECTS)
 
-libImpExp_a_SOURCES = 
+libImpExp_la_SOURCES = 
 
-libImpExp_a_LIBADD = $(objects)
+libImpExp_la_LIBADD = $(objects)
Index: src/wp/impexp/cocoa/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/cocoa/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/wp/impexp/cocoa/GNUmakefile.am	2 Oct 2006 21:17:19 -0000	1.3
+++ src/wp/impexp/cocoa/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -24,7 +24,7 @@
 	$(LIBPNG_INCLUDES) $(OTHER_INCLUDES)  \
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@
 
-noinst_LIBRARIES = libImpExp_cocoa.a
+noinst_LTLIBRARIES = libImpExp_cocoa.la
 
-libImpExp_cocoa_a_SOURCES = ie_impexp_RegisterCocoa.cpp \
+libImpExp_cocoa_la_SOURCES = ie_impexp_RegisterCocoa.cpp \
 		ie_impGraphic_Cocoa.mm
Index: src/wp/impexp/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/qnx/GNUmakefile.am,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.am
--- src/wp/impexp/qnx/GNUmakefile.am	2 Oct 2006 21:17:20 -0000	1.3
+++ src/wp/impexp/qnx/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -23,6 +23,6 @@
 	$(LIBPNG_INCLUDES) $(OTHER_INCLUDES) \
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@
 
-noinst_LIBRARIES = libImpExp_qnx.a
+noinst_LTLIBRARIES = libImpExp_qnx.la
 
-libImpExp_qnx_a_SOURCES = ie_impexp_RegisterQNX.cpp
+libImpExp_qnx_la_SOURCES = ie_impexp_RegisterQNX.cpp
Index: src/wp/impexp/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/unix/GNUmakefile.am,v
retrieving revision 1.10
diff -u -r1.10 GNUmakefile.am
--- src/wp/impexp/unix/GNUmakefile.am	2 Oct 2006 21:17:20 -0000	1.10
+++ src/wp/impexp/unix/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -23,7 +23,7 @@
 	$(LIBPNG_INCLUDES) $(OTHER_INCLUDES)  \
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@ @GNOMEVFS_CFLAGS@
 
-noinst_LIBRARIES = libImpExp_unix.a
+noinst_LTLIBRARIES = libImpExp_unix.la
 
 if WITH_PRINTING
 print_src = ie_exp_PDF.cpp \
@@ -33,7 +33,7 @@
 endif
 
 
-libImpExp_unix_a_SOURCES = \
+libImpExp_unix_la_SOURCES = \
 			$(print_src) \
 			ie_impexp_RegisterUnix.cpp \
 			ie_impGraphic_GdkPixbuf.cpp
Index: src/wp/impexp/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/win/GNUmakefile.am,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.am
--- src/wp/impexp/win/GNUmakefile.am	23 Jul 2005 14:43:11 -0000	1.1
+++ src/wp/impexp/win/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -23,6 +23,6 @@
 	$(TEXT_INCLUDES) $(AF_INCLUDES)  $(ICONV_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(OTHER_INCLUDES)
 
-noinst_LIBRARIES = libImpExp_win.a
+noinst_LTLIBRARIES = libImpExp_win.la
 
-libImpExp_win_a_SOURCES = ie_impexp_RegisterWin32.cpp
+libImpExp_win_la_SOURCES = ie_impexp_RegisterWin32.cpp
Index: src/wp/impexp/xp/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/GNUmakefile.am,v
retrieving revision 1.38
diff -u -r1.38 GNUmakefile.am
--- src/wp/impexp/xp/GNUmakefile.am	27 Jan 2005 14:43:51 -0000	1.38
+++ src/wp/impexp/xp/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -22,9 +22,9 @@
 	$(TEXT_INCLUDES) $(AF_INCLUDES) $(WV_INCLUDES) $(ICONV_INCLUDES) \
 	$(LIBPNG_INCLUDES)
 
-noinst_LIBRARIES = libImpExp_xp.a
+noinst_LTLIBRARIES = libImpExp_xp.la
 
-libImpExp_xp_a_SOURCES=\
+libImpExp_xp_la_SOURCES=\
 	ie_exp_AbiWord_1.cpp		\
 	ie_exp_AWT.cpp			\
 	ie_exp.cpp			\
Index: src/wp/main/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/main/unix/GNUmakefile.am,v
retrieving revision 1.31
diff -u -r1.31 GNUmakefile.am
--- src/wp/main/unix/GNUmakefile.am	16 Oct 2005 13:02:07 -0000	1.31
+++ src/wp/main/unix/GNUmakefile.am	21 Nov 2006 22:23:21 -0000
@@ -20,8 +20,6 @@
 
 CLEANFILES = abi_ver.cpp
 
-bin_PROGRAMS = AbiWord-2.6
-
 INCLUDES = \
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
 	-DABISUITE_HOME="\"$(pkgdatadir)\"" \
@@ -29,11 +27,29 @@
 	$(PLUGIN_DEFS) -I$(top_srcdir)/../abiword-plugins \
 	$(BINRELOC_CFLAGS)
 
-REPEAT_LIBS = $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS)
+lib_LTLIBRARIES = libabipriv-1.la
+
+libabipriv_1_la_SOURCES = abi_ver.cpp
+#libabipriv_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic
+libabipriv_1_la_LDFLAGS = -version-info 0:0:0 -export-dynamic
+libabipriv_1_la_LIBADD = \
+	../../../af/ev/libEv.la \
+	../../../af/gr/libGr.la \
+	../../../af/util/libUtil.la \
+	../../../af/xap/libXap.la \
+	../../../text/fmt/xp/libFmt.la \
+	../../../text/ptbl/xp/libPtbl.la \
+	../../../other/spell/xp/libSpell.la \
+	../../../other/ttftool/unix/libTtfTool.la \
+	../../ap/libAp.la \
+	../../impexp/libImpExp.la \
+	$(PLATFORM_LIBS) $(OTHER_LIBS)
+
+bin_PROGRAMS = AbiWord-2.6
 
-AbiWord_2_6_LDADD = @PLUGIN_LIST@ $(REPEAT_LIBS) $(PLATFORM_LIBS) $(OTHER_LIBS) 
+AbiWord_2_6_SOURCES = UnixMain.cpp
 
-AbiWord_2_6_SOURCES = abi_ver.cpp UnixMain.cpp
+AbiWord_2_6_LDADD = @PLUGIN_LIST@ $(ltsubdir)libabipriv-1.a $(PLATFORM_LIBS) $(OTHER_LIBS) 
 
 abi_ver.cpp:	@PLUGIN_LIST@
 	cp $(srcdir)/../xp/abi_ver.cpp .