From ed348a5b04e223ac7ee1d4e1f4d582135d2eece8 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 25 Mar 2009 20:35:48 +0000 Subject: First cut at a port to the new buildsystem. DOMTS stuff currently disabled. svn path=/trunk/dom/; revision=6883 --- bindings/Makefile | 52 +------------------------------- bindings/hubbub/Makefile | 76 ++++++++--------------------------------------- bindings/xml/Makefile | 77 ++++++++---------------------------------------- 3 files changed, 25 insertions(+), 180 deletions(-) (limited to 'bindings') diff --git a/bindings/Makefile b/bindings/Makefile index 67c3f25..26e4927 100644 --- a/bindings/Makefile +++ b/bindings/Makefile @@ -1,51 +1 @@ -# Makefile for libdom -# -# Toolchain is exported by top-level makefile -# -# Top-level makefile also exports the following variables: -# -# COMPONENT Name of component -# EXPORT Absolute path of export directory -# TOP Absolute path of source tree root -# -# The top-level makefile requires the following targets to exist: -# -# clean Clean source tree -# debug Create a debug binary -# distclean Fully clean source tree, back to pristine condition -# export Export distributable components to ${EXPORT} -# release Create a release binary -# setup Perform any setup required prior to compilation -# test Execute any test cases - -.PHONY: clean debug distclean export release setup test - -# Targets -release: - @${MAKE} -C xml release - @${MAKE} -C hubbub release - -debug: - @${MAKE} -C xml debug - @${MAKE} -C hubbub debug - -clean: - @${MAKE} -C xml clean - @${MAKE} -C hubbub clean - -distclean: - @${MAKE} -C xml distclean - @${MAKE} -C hubbub distclean - -setup: - @${MAKE} -C xml setup - @${MAKE} -C hubbub setup - -export: - @${MAKE} -C xml export - @${MAKE} -C hubbub export - -test: - @${MAKE} -C xml test - @${MAKE} -C hubbub test - +include build/makefiles/Makefile.subdir diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile index d98565a..b575e27 100644 --- a/bindings/hubbub/Makefile +++ b/bindings/hubbub/Makefile @@ -1,68 +1,16 @@ -# Makefile for libdom -# -# Toolchain is exported by top-level makefile -# -# Top-level makefile also exports the following variables: -# -# COMPONENT Name of component -# EXPORT Absolute path of export directory -# TOP Absolute path of source tree root -# -# The top-level makefile requires the following targets to exist: -# -# clean Clean source tree -# debug Create a debug binary -# distclean Fully clean source tree, back to pristine condition -# export Export distributable components to ${EXPORT} -# release Create a release binary -# setup Perform any setup required prior to compilation -# test Execute any test cases +ifeq ($(WITH_HUBBUB_BINDING),yes) + DIR_SOURCES := parser.c -# Manipulate include paths -CFLAGS += -I$(CURDIR) `$(PKGCONFIG) --cflags libhubbub` + DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h -# Release output -RELEASE = ${TOP}/${COMPONENT}-libhubbub.a + # Hubbub + ifneq ($(PKGCONFIG),) + CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub --cflags) + LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub --libs) + else + LDFLAGS := $(LDFLAGS) -lhubbub -lparserutils + endif +endif -# Debug output -DEBUG = ${TOP}/${COMPONENT}-libhubbub-debug.a - -# Objects -OBJS = parser - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix Release/, $(addsuffix .o, $(OBJS))) - @${AR} ${ARFLAGS} $(RELEASE) Release/* - -debug: $(addprefix Debug/, $(addsuffix .o, $(OBJS))) - @${AR} ${ARFLAGS} $(DEBUG) Debug/* - -clean: - -@${RM} ${RMFLAGS} $(addprefix Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix Debug/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(RELEASE) $(DEBUG) - -distclean: - -@${RM} ${RMFLAGS} -r Release - -@${RM} ${RMFLAGS} -r Debug - -setup: - @${MKDIR} ${MKDIRFLAGS} Release - @${MKDIR} ${MKDIRFLAGS} Debug - -export: - @${CP} ${CPFLAGS} $(RELEASE) ${EXPORT}/lib/ - -test: - -# Pattern rules -Release/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c ${CFLAGS} -DNDEBUG -o $@ $< - -Debug/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c -g ${CFLAGS} -o $@ $< +include build/makefiles/Makefile.subdir diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile index b5b9757..bdebe41 100644 --- a/bindings/xml/Makefile +++ b/bindings/xml/Makefile @@ -1,69 +1,16 @@ -# Makefile for libdom -# -# Toolchain is exported by top-level makefile -# -# Top-level makefile also exports the following variables: -# -# COMPONENT Name of component -# EXPORT Absolute path of export directory -# TOP Absolute path of source tree root -# -# The top-level makefile requires the following targets to exist: -# -# clean Clean source tree -# debug Create a debug binary -# distclean Fully clean source tree, back to pristine condition -# export Export distributable components to ${EXPORT} -# release Create a release binary -# setup Perform any setup required prior to compilation -# test Execute any test cases +ifeq ($(WITH_LIBXML_BINDING),yes) + DIR_SOURCES := xmlbinding.c xmlparser.c -# Manipulate include paths -CFLAGS += -I$(CURDIR) \ - `${PKGCONFIG} ${PKGCONFIGFLAGS} --cflags libxml-2.0` \ - -D_POSIX_C_SOURCE + DIR_INSTALL_ITEMS := /include/dom/bindings/libxml:xmlbinding.h;xmlerror.h;xmlparser.h -# Release output -RELEASE = ${TOP}/${COMPONENT}-libxml.a + # LibXML2 + ifneq ($(PKGCONFIG),) + CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libxml-2.0 --cflags) + LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libxml-2.0 --libs) + else + LDFLAGS := $(LDFLAGS) -lxml2 + endif +endif -# Debug output -DEBUG = ${TOP}/${COMPONENT}-libxml-debug.a +include build/makefiles/Makefile.subdir -# Objects -OBJS = xmlbinding xmlparser - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix Release/, $(addsuffix .o, $(OBJS))) - @${AR} ${ARFLAGS} $(RELEASE) Release/* - -debug: $(addprefix Debug/, $(addsuffix .o, $(OBJS))) - @${AR} ${ARFLAGS} $(DEBUG) Debug/* - -clean: - -@${RM} ${RMFLAGS} $(addprefix Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix Debug/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(RELEASE) $(DEBUG) - -distclean: - -@${RM} ${RMFLAGS} -r Release - -@${RM} ${RMFLAGS} -r Debug - -setup: - @${MKDIR} ${MKDIRFLAGS} Release - @${MKDIR} ${MKDIRFLAGS} Debug - -export: - @${CP} ${CPFLAGS} $(RELEASE) ${EXPORT}/lib/ - -test: - -# Pattern rules -Release/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c ${CFLAGS} -DNDEBUG -o $@ $< - -Debug/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c -g ${CFLAGS} -o $@ $< -- cgit v1.2.3