Tweaks for keeping Josef's external Callgrind tool running, including a bumping

of the interface major version number.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3043

diff --git a/include/tool.h.base b/include/tool.h.base
index 74e624c06896647046ff1d43bd9be708948abec2..09b406482bdf93216c881c48effe7fbcec4f09bf 100644 (file)
--- a/include/tool.h.base
+++ b/include/tool.h.base
@@ -79,8 +79,11 @@ extern const Char *VG_(libdir);
 /* The major version number indicates binary-incompatible changes to the
    interface;  if the core and tool major versions don't match, Valgrind
    will abort.  The minor version indicates binary-compatible changes.
+
+   (Update: as it happens, we're never using the minor version number, because
+   there's no point in doing so.)
 */
-#define VG_CORE_INTERFACE_MAJOR_VERSION   6
+#define VG_CORE_INTERFACE_MAJOR_VERSION   7
 #define VG_CORE_INTERFACE_MINOR_VERSION   0
 
 typedef struct _ToolInfo {

diff --git a/valgrind.pc.in b/valgrind.pc.in
index 1b5e3384d6189e847f4535a820e873e883f79d16..883f5698782fb6eaa1a8e65ae8154ae984705871 100644 (file)
--- a/valgrind.pc.in
+++ b/valgrind.pc.in
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/valgrind
 
 Name: Valgrind
 Description: Program supervision framework for x86-GNU/Linux
 Version: @VERSION@
 Requires:
 Libs:
-Cflags: -I${includedir} -I${includedir}/@VG_ARCH@ -I${includedir}/@VG_PLATFORM@
+Cflags: -I${includedir} -I${includedir}/@VG_ARCH@ -I${includedir}/@VG_OS@ -I${includedir}/@VG_PLATFORM@ @ARCH_TOOL_AM_CFLAGS@