Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 28076) +++ src/Makefile.am (working copy) @@ -33,16 +33,16 @@ endif if TOOLKIT_COCOA -frameworks_LTLIBRARIES = libabiword-2.7.la +frameworks_LTLIBRARIES = libabiword-2.8.la else -lib_LTLIBRARIES = libabiword-2.7.la +lib_LTLIBRARIES = libabiword-2.8.la endif -libabiword_2_7_la_CPPFLAGS = \ +libabiword_2_8_la_CPPFLAGS = \ $(WP_CPPFLAGS) \ -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" -libabiword_2_7_la_LDFLAGS = \ +libabiword_2_8_la_LDFLAGS = \ $(DEPS_LIBS) \ --no-undefined \ -avoid-version \ @@ -50,10 +50,10 @@ if TOOLKIT_COCOA -libabiword_2_7_la_LDFLAGS += -headerpad_max_install_names +libabiword_2_8_la_LDFLAGS += -headerpad_max_install_names endif -libabiword_2_7_la_LIBADD = \ +libabiword_2_8_la_LIBADD = \ $(opt_libs) \ plugins/libplugins.la \ text/fmt/xp/libxp.la \ @@ -72,27 +72,27 @@ af/ev/xp/libxp.la if TOOLKIT_GTK -libabiword_2_7_la_LIBADD += text/fmt/gtk/libgtk.la +libabiword_2_8_la_LIBADD += text/fmt/gtk/libgtk.la # headers are GTK only. -libabiword_2_7_includedir = @ABIWORD_HEADERSDIR@ -libabiword_2_7_include_HEADERS = \ +libabiword_2_8_includedir = @ABIWORD_HEADERSDIR@ +libabiword_2_8_include_HEADERS = \ wp/ap/gtk/abiwidget.h \ wp/main/gtk/libabiword.h \ af/xap/gtk/xap_UnixTableWidget.h endif -libabiword_2_7_la_DEPENDENCIES = \ - $(libabiword_2_7_la_LIBADD) +libabiword_2_8_la_DEPENDENCIES = \ + $(libabiword_2_8_la_LIBADD) -libabiword_2_7_la_SOURCES = \ +libabiword_2_8_la_SOURCES = \ $(top_srcdir)/src/wp/main/xp/abi_ver.cpp \ $(libabiword_cpp) # TODO is it possible to track dependencies for that? WINDRES_CPPFLAGS = -I$(top_srcdir)/src/af/xap/win -I$(top_srcdir)/src/af/util/win -I$(top_srcdir)/src/wp/ap/win -Win32Resources.lo: $(top_srcdir)/src/wp/main/win/Win32Main.rc $(libabiword_2_7_la_OBJECTS) +Win32Resources.lo: $(top_srcdir)/src/wp/main/win/Win32Main.rc $(libabiword_2_8_la_OBJECTS) CPPFLAGS="$(WINDRES_CPPFLAGS)" $(top_srcdir)/lt-compile-resource $< $@ bin_PROGRAMS = @@ -103,7 +103,7 @@ AbiWord_CPPFLAGS = \ -x objective-c++ \ - $(libabiword_2_7_la_CPPFLAGS) + $(libabiword_2_8_la_CPPFLAGS) AbiWord_LDFLAGS = \ $(DEPS_LIBS) \ @@ -113,7 +113,7 @@ -headerpad_max_install_names AbiWord_LDADD = \ - libabiword-2.7.la + libabiword-2.8.la AbiWord_SOURCES = \ $(main_cpp) @@ -125,7 +125,7 @@ bin_PROGRAMS += abiword abiword_CPPFLAGS = \ - $(libabiword_2_7_la_CPPFLAGS) + $(libabiword_2_8_la_CPPFLAGS) abiword_LDFLAGS = \ $(platform_ldflags) \ @@ -134,12 +134,12 @@ -export-dynamic abiword_LDADD = \ - libabiword-2.7.la \ + libabiword-2.8.la \ $(resources) \ $(DEPS_LIBS) abiword_DEPENDENCIES = \ - libabiword-2.7.la \ + libabiword-2.8.la \ $(resources) abiword_SOURCES = \