diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:06:41 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:06:41 +0000 |
commit | d3d77b38ee1e632c28d25da9a9b2b67188d76cc8 (patch) | |
tree | f2bc333f87d63ed640f37acf6c2075179b3c14ec | |
parent | 3accba40db78dcd79d287a116b37c97889f9fc5b (diff) | |
download | libdom-d3d77b38ee1e632c28d25da9a9b2b67188d76cc8.tar.gz libdom-d3d77b38ee1e632c28d25da9a9b2b67188d76cc8.tar.bz2 |
Sync with core buildsystem changes
svn path=/trunk/dom/; revision=7225
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | bindings/hubbub/Makefile | 9 | ||||
-rw-r--r-- | libdom.pc.in | 4 |
3 files changed, 10 insertions, 11 deletions
@@ -20,16 +20,16 @@ include build/makefiles/Makefile.top # Extra installation rules Is := include/dom -I := /include/dom$(major-version)/dom +I := /include/dom INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h Is := include/dom/bootstrap -I := /include/dom$(major-version)/dom/bootstrap +I := /include/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 +I := /include/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 @@ -46,6 +46,6 @@ ifeq ($(WITH_LIBXML_BINDING),yes) endif ifeq ($(WITH_HUBBUB_BINDING),yes) - REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub-0 + REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub endif diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile index 20ced26..59b7d3b 100644 --- a/bindings/hubbub/Makefile +++ b/bindings/hubbub/Makefile @@ -5,12 +5,11 @@ ifeq ($(WITH_HUBBUB_BINDING),yes) # Hubbub ifneq ($(PKGCONFIG),) - CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --cflags) - LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --libs) + CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub --cflags) + LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub --libs) else - CFLAGS := $(CFLAGS) -I$(PREFIX)/include/hubbub0 \ - -I$(PREFIX)/include/parserutils0 - LDFLAGS := $(LDFLAGS) -lhubbub0 -lparserutils0 + CFLAGS := $(CFLAGS) -I$(PREFIX)/include + LDFLAGS := $(LDFLAGS) -lhubbub -lparserutils endif endif diff --git a/libdom.pc.in b/libdom.pc.in index 8b9bad1..60a1f62 100644 --- a/libdom.pc.in +++ b/libdom.pc.in @@ -7,5 +7,5 @@ Name: libdom Description: W3C DOM implementation Version: VERSION REQUIRED -Libs: -L${libdir} -ldomMAJOR -Cflags: -I${includedir}/domMAJOR +Libs: -L${libdir} -ldom +Cflags: -I${includedir} |