diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-03 02:01:37 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-03 02:01:37 +0000 |
| commit | 98ad8d8ef83d21fe9305722285f266ca275a39ce (patch) | |
| tree | d1a6fddee464a040d9566f6e1a213cfd082e128e | |
| parent | 814e1be2f2f2ce9fd2210b2581336c3e6d41ae6d (diff) | |
| download | libhubbub-98ad8d8ef83d21fe9305722285f266ca275a39ce.tar.gz libhubbub-98ad8d8ef83d21fe9305722285f266ca275a39ce.tar.bz2 | |
Shared library versioning
svn path=/trunk/hubbub/; revision=7036
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | libhubbub.pc.in | 8 |
2 files changed, 16 insertions, 14 deletions
@@ -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 |