diff options
| -rw-r--r-- | Makefile | 38 | ||||
| -rw-r--r-- | bindings/hubbub/Makefile | 6 | ||||
| -rw-r--r-- | libdom.pc.in | 6 |
3 files changed, 27 insertions, 23 deletions
@@ -1,5 +1,6 @@ # Component settings COMPONENT := dom +COMPONENT_VERSION := 0.0.1 # Default to a static library COMPONENT_TYPE ?= lib-static @@ -18,30 +19,33 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \ include build/makefiles/Makefile.top # Extra installation rules -I := include/dom -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/dom.h;$(I)/functypes.h - -I := include/dom/bootstrap -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/implpriv.h;$(I)/implregistry.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/init_fini.h - -I := include/dom/core -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/attr.h;$(I)/characterdata.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/document.h;$(I)/document_type.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/element.h;$(I)/exceptions.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/implementation.h;$(I)/impllist.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/namednodemap.h;$(I)/node.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/nodelist.h;$(I)/string.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/text.h +Is := include/dom +I := /include/dom$(major-version)/dom +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h + +Is := include/dom/bootstrap +I := /include/dom$(major-version)/dom/bootstrap +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/implpriv.h;$(Is)/implregistry.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/init_fini.h + +Is := include/dom/core +I := /include/dom$(major-version)/dom/core +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document.h;$(Is)/document_type.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/element.h;$(Is)/exceptions.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/implementation.h;$(Is)/impllist.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/namednodemap.h;$(Is)/node.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/nodelist.h;$(Is)/string.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.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) ifeq ($(WITH_LIBXML_BINDING),yes) REQUIRED_PKGS := $(REQUIRED_PKGS) libxml-2.0 endif ifeq ($(WITH_HUBBUB_BINDING),yes) - REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub + REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub-0 endif diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile index b575e27..eef8ec6 100644 --- a/bindings/hubbub/Makefile +++ b/bindings/hubbub/Makefile @@ -5,10 +5,10 @@ ifeq ($(WITH_HUBBUB_BINDING),yes) # Hubbub ifneq ($(PKGCONFIG),) - CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub --cflags) - LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub --libs) + CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --cflags) + LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --libs) else - LDFLAGS := $(LDFLAGS) -lhubbub -lparserutils + LDFLAGS := $(LDFLAGS) -lhubbub0 -lparserutils0 endif endif diff --git a/libdom.pc.in b/libdom.pc.in index cb02f34..8b9bad1 100644 --- a/libdom.pc.in +++ b/libdom.pc.in @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: libdom Description: W3C DOM implementation -Version: 0.0.1 +Version: VERSION REQUIRED -Libs: -L${libdir} -ldom -Cflags: -I${includedir} +Libs: -L${libdir} -ldomMAJOR +Cflags: -I${includedir}/domMAJOR |