From 98ad8d8ef83d21fe9305722285f266ca275a39ce Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 3 Apr 2009 02:01:37 +0000
Subject: Shared library versioning

svn path=/trunk/hubbub/; revision=7036
---
 Makefile        | 22 ++++++++++++----------
 libhubbub.pc.in |  8 ++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9e65544..980f77e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # Component settings
 COMPONENT := hubbub
+COMPONENT_VERSION := 0.0.1
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -17,10 +18,10 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
 
 # Parserutils
 ifneq ($(PKGCONFIG),)
-  CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
-  LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
+  CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils-0 --cflags)
+  LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils-0 --libs)
 else
-  LDFLAGS := $(LDFLAGS) -lparserutils
+  LDFLAGS := $(LDFLAGS) -lparserutils0
 endif
 
 include build/makefiles/Makefile.top
@@ -40,11 +41,12 @@ ifeq ($(WANT_TEST),yes)
 endif
 
 # Extra installation rules
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/errors.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/functypes.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/hubbub.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/parser.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/tree.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/hubbub:include/hubbub/types.h
+I := /include/hubbub$(major-version)/hubbub
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/parser.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/tree.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/types.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
+INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
diff --git a/libhubbub.pc.in b/libhubbub.pc.in
index b5449a1..3cdb0f0 100644
--- a/libhubbub.pc.in
+++ b/libhubbub.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: libhubbub
 Description: HTML5 parsing library
-Version: 0.0.1
-Requires: libparserutils
-Libs: -L${libdir} -lhubbub
-Cflags: -I${includedir}
+Version: VERSION
+Requires: libparserutils-0
+Libs: -L${libdir} -lhubbubMAJOR
+Cflags: -I${includedir}/hubbubMAJOR
-- 
cgit v1.2.3