Index: src/Makefile.am =================================================================== --- src/Makefile.am (révision 28482) +++ src/Makefile.am (copie de travail) @@ -33,20 +33,20 @@ endif if TOOLKIT_COCOA -frameworks_LTLIBRARIES = libabiword-2.8.la +frameworks_LTLIBRARIES = libabiword-@ABIWORD_SERIES@.la else if TOOLKIT_WIN -noinst_LTLIBRARIES = libabiword-2.8.la +noinst_LTLIBRARIES = libabiword-@ABIWORD_SERIES@.la else -lib_LTLIBRARIES = libabiword-2.8.la +lib_LTLIBRARIES = libabiword-@ABIWORD_SERIES@.la endif endif -libabiword_2_8_la_CPPFLAGS = \ +libabiword_@ABIWORD_SERIES@_la_CPPFLAGS = \ $(WP_CPPFLAGS) \ -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" -libabiword_2_8_la_LDFLAGS = \ +libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \ $(DEPS_LIBS) \ -no-undefined \ -avoid-version \ @@ -54,10 +54,10 @@ if TOOLKIT_COCOA -libabiword_2_8_la_LDFLAGS += -headerpad_max_install_names +libabiword_@ABIWORD_SERIES@_la_LDFLAGS += -headerpad_max_install_names endif -libabiword_2_8_la_LIBADD = \ +libabiword_@ABIWORD_SERIES@_la_LIBADD = \ $(opt_libs) \ plugins/libplugins.la \ text/fmt/xp/libxp.la \ @@ -76,27 +76,27 @@ af/ev/xp/libxp.la if TOOLKIT_GTK -libabiword_2_8_la_LIBADD += text/fmt/gtk/libgtk.la +libabiword_@ABIWORD_SERIES@_la_LIBADD += text/fmt/gtk/libgtk.la # headers are GTK only. -libabiword_2_8_includedir = @ABIWORD_HEADERSDIR@ -libabiword_2_8_include_HEADERS = \ +libabiword_@ABIWORD_SERIES@_includedir = @ABIWORD_HEADERSDIR@ +libabiword_@ABIWORD_SERIES@_include_HEADERS = \ wp/ap/gtk/abiwidget.h \ wp/main/gtk/libabiword.h \ af/xap/gtk/xap_UnixTableWidget.h endif -libabiword_2_8_la_DEPENDENCIES = \ - $(libabiword_2_8_la_LIBADD) +libabiword_@ABIWORD_SERIES@_la_DEPENDENCIES = \ + $(libabiword_@ABIWORD_SERIES@_la_LIBADD) -libabiword_2_8_la_SOURCES = \ +libabiword_@ABIWORD_SERIES@_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_8_la_OBJECTS) +Win32Resources.lo: $(top_srcdir)/src/wp/main/win/Win32Main.rc $(libabiword_@ABIWORD_SERIES@_la_OBJECTS) CPPFLAGS="$(WINDRES_CPPFLAGS)" $(top_srcdir)/lt-compile-resource $< $@ bin_PROGRAMS = @@ -107,7 +107,7 @@ AbiWord_CPPFLAGS = \ -x objective-c++ \ - $(libabiword_2_8_la_CPPFLAGS) + $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS) AbiWord_LDFLAGS = \ $(DEPS_LIBS) \ @@ -117,7 +117,7 @@ -headerpad_max_install_names AbiWord_LDADD = \ - libabiword-2.8.la + libabiword-@ABIWORD_SERIES@.la AbiWord_SOURCES = \ $(main_cpp) @@ -129,7 +129,7 @@ bin_PROGRAMS += abiword abiword_CPPFLAGS = \ - $(libabiword_2_8_la_CPPFLAGS) + $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS) abiword_LDFLAGS = \ $(platform_ldflags) \ @@ -138,12 +138,12 @@ -export-dynamic abiword_LDADD = \ - libabiword-2.8.la \ + libabiword-@ABIWORD_SERIES@.la \ $(resources) \ $(DEPS_LIBS) abiword_DEPENDENCIES = \ - libabiword-2.8.la \ + libabiword-@ABIWORD_SERIES@.la \ $(resources) abiword_SOURCES = \