From 7ab2ca6642902f0e3ca095420eaf6a97e5b639ed Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 3 Apr 2009 01:44:55 +0000
Subject: Reflect shared library versioning

svn path=/trunk/libcss/; revision=7032
---
 Makefile     | 31 +++++++++++++++++--------------
 libcss.pc.in |  9 +++++----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 1e8b2e3..2a93926 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # Component settings
 COMPONENT := css
+COMPONENT_VERSION := 0.0.1
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -17,24 +18,26 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
 
 # Parserutils & wapcaplet
 ifneq ($(PKGCONFIG),)
-  CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils libwapcaplet --cflags)
-  LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils libwapcaplet --libs)
+  CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils-0 libwapcaplet-0 --cflags)
+  LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils-0 libwapcaplet-0 --libs)
 else
-  LDFLAGS := $(LDFLAGS) -lparserutils -lwapcaplet
+  LDFLAGS := $(LDFLAGS) -lparserutils0 -lwapcaplet0
 endif
 
 include build/makefiles/Makefile.top
 
 # Extra installation rules
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/computed.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/errors.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/fpmath.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/functypes.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/hint.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/libcss.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/properties.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/select.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/stylesheet.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/libcss:include/libcss/types.h
+I := /include/libcss$(major-version)/libcss
+
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/fpmath.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/functypes.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/hint.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/libcss.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/properties.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/select.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/stylesheet.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/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/libcss.pc.in b/libcss.pc.in
index ace6718..e3c520e 100644
--- a/libcss.pc.in
+++ b/libcss.pc.in
@@ -5,7 +5,8 @@ includedir=${prefix}/include
 
 Name: libcss
 Description: CSS parsing and selection library
-Version: 0.0.1
-Requires: libparserutils, libwapcaplet
-Libs: -L${libdir} -lcss
-Cflags: -I${includedir}
+Version: VERSION
+Requires: libparserutils-0, libwapcaplet-0
+Libs: -L${libdir} -lcssMAJOR
+Cflags: -I${includedir}/libcssMAJOR
+
-- 
cgit v1.2.3