Commit 47c91b30 authored by Jody Goldberg's avatar Jody Goldberg

version the include path and .pc file

svn path=/trunk/; revision=16249
parent 91712538
......@@ -38,5 +38,7 @@ GNOME_Gnumeric.server
.intltool-cache*
xmldocs.make
omf.make
libspreadsheet.pc
libspreadsheet-1.8.pc
libspreadsheet-1.7.pc
.dotest
......@@ -8,15 +8,9 @@ release, and longer term bugs.
For 1.8
-------
: Get a list of criticals fixed between 1.6 and 1.8
: http://bugzilla.gnome.org/show_bug.cgi?id=450444 (themeable icons)
: tango icons
http://live.gnome.org/GnomeGoals/AppIcon
http://live.gnome.org/ThemableAppSpecificIcons
Release Critical
----------------
: undo of cell range cut over clipboard
http://live.gnome.org/Academic
In Progress
-----------
......@@ -38,6 +32,14 @@ Short term goals
- replicate win32 print problems
- Finish the Data -> Table dialog (DONE)
- Use go_glade_signal_connect (and friends)
: http://bugzilla.gnome.org/show_bug.cgi?id=450444 (themeable icons)
: tango icons
http://live.gnome.org/GnomeGoals/AppIcon
http://live.gnome.org/ThemableAppSpecificIcons
: undo of cell range cut over clipboard
http://live.gnome.org/Academic
: ={A1:A3+rand()} only calls rand() once.
Worries
-------
......
......@@ -21,10 +21,14 @@ EXTRA_DIST = \
intltool-merge.in \
intltool-update.in \
xmldocs.make \
libspreadsheet.pc.in \
omf.make
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libspreadsheet-1.7.pc
pkgconfig_DATA = libspreadsheet-@GNUMERIC_API_VER@.pc
libspreadsheet-@GNUMERIC_API_VER@.pc: libspreadsheet.pc
cp $< $@
@INTLTOOL_DESKTOP_RULE@
......
......@@ -20,6 +20,26 @@ AC_INIT([gnumeric], [gnumeric_version_full],
AC_CONFIG_SRCDIR(src/sheet.h)
AM_INIT_AUTOMAKE([dist-bzip2])
dnl Version info for libraries = CURRENT:REVISION:AGE
dnl
dnl Within each x.y.*, ABI is maintained backward and _forward_ compatible.
dnl (As a consequence, no exported function may be added.)
dnl So it's enough to have one interface number per each x.y.* branch.
dnl
dnl OTOH, we are not able to keep ABI strictly backward compatible throughout
dnl the whole x.*.*.
dnl The easiest way is to declare no ABI compatibility, ie. AGE is always 0.
dnl
m4_define([version_iface],
m4_eval(100 * gnumeric_version_epoch + gnumeric_version_major))
AC_SUBST([VERSION_INFO], [version_iface:gnumeric_version_minor:0])
AC_SUBST([VERSION_IFACE], [version_iface])
dnl Almost like epoch.major but development versions look forward to the next
dnl stable release.
AC_SUBST([GNUMERIC_API_VER], [1.8])
dnl This one is created by autoheader, ...
AC_CONFIG_HEADERS(gnumeric-config.h)
......@@ -1036,7 +1056,7 @@ AC_DEFINE(GNM_VERSION_EXTRA, "gnumeric_version_extra",
AC_OUTPUT([
gnumeric.spec
Makefile
libspreadsheet-1.7.pc
libspreadsheet.pc
icons/Makefile
src/Makefile
src/dialogs/Makefile
......
......@@ -4,6 +4,7 @@ libdir=@libdir@
includedir=@includedir@
VERSION=@VERSION@
gnumeric_libdir=@gnumeric_libdir@
libgoffice=@LIBGOFFICE@
Name: libspreadsheet
Description: The spreadsheet internals of Gnumeric (DEVELOPMENT VERSION)
......@@ -11,9 +12,9 @@ Version: @VERSION@
URL: http://www.gnumeric.org
Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 @LIBGOFFICE@
Requires.private: libart-2.0
Libs: -L${libdir} -lgoffice-0
Libs: -L${libdir} -lspreadsheet-@GNUMERIC_API_VER@ @GTK_EXTRA_LIBS@
# for now include both the directory and the child, until we rename the includes in svn
Cflags: -I${includedir}/libspreadsheet-1-7/spreadsheet -I${includedir}/libspreadsheet-1-7 -I${gnumeric_libdir}/include
Cflags: -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@ -I${gnumeric_libdir}/include
PluginDir: @gnumeric_plugindir@
No preview for this file type
......@@ -162,7 +162,7 @@ libspreadsheet_la_SOURCES = \
# When we switch to subversion fix this to nest as
# libspreadsheet-ver/spreadsheet/header
# doing it now would require massive cvs surgery.
libspreadsheet_includedir = $(includedir)/libspreadsheet-1-7/spreadsheet
libspreadsheet_includedir = $(includedir)/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet
libspreadsheet_include_HEADERS = \
application.h \
auto-format.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment