From 71f4a46b3a94a406530ef000420795e49d17ebf4 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 --- src/Makefile | 78 +------------------------------------------------- src/bootstrap/Makefile | 54 ++-------------------------------- src/core/Makefile | 65 ++++++----------------------------------- src/utils/Makefile | 55 ++--------------------------------- 4 files changed, 14 insertions(+), 238 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 6c780a4..3cbaf86 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,78 +1,2 @@ -# 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 -# Manipulate include paths -CFLAGS += -I$(CURDIR) - -# Release output -RELEASE = ${TOP}/${COMPONENT}.a - -# Debug output -DEBUG = ${TOP}/${COMPONENT}-debug.a - -# Objects -OBJS = - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix Release/, $(addsuffix .o, $(OBJS))) - @${MAKE} -C bootstrap release - @${MAKE} -C core release - @${MAKE} -C utils release - @${AR} ${ARFLAGS} $(RELEASE) Release/* - -debug: $(addprefix Debug/, $(addsuffix .o, $(OBJS))) - @${MAKE} -C bootstrap debug - @${MAKE} -C core debug - @${MAKE} -C utils debug - @${AR} ${ARFLAGS} $(DEBUG) Debug/* - -clean: - @${MAKE} -C bootstrap clean - @${MAKE} -C core clean - @${MAKE} -C utils clean -ifneq (${OBJS}, ) - -@${RM} ${RMFLAGS} $(addprefix Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix Debug/, $(addsuffix .o, ${OBJS})) -endif - -@${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/src/bootstrap/Makefile b/src/bootstrap/Makefile index 0eed6c7..820a4f4 100644 --- a/src/bootstrap/Makefile +++ b/src/bootstrap/Makefile @@ -1,53 +1,3 @@ -# 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 +DIR_SOURCES := implregistry.c init_fini.c -# Manipulate include paths -CFLAGS += -I$(CURDIR) - -# Objects -OBJS = implregistry init_fini - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix ../Release/, $(addsuffix .o, $(OBJS))) - -debug: $(addprefix ../Debug/, $(addsuffix .o, $(OBJS))) - -clean: - -@${RM} ${RMFLAGS} $(addprefix ../Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix ../Debug/, $(addsuffix .o, ${OBJS})) - -distclean: - -setup: - -export: - -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/src/core/Makefile b/src/core/Makefile index 3084012..9abadad 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -1,57 +1,8 @@ -# 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 - -# Manipulate include paths -CFLAGS += -I$(CURDIR) - -# Objects -OBJS = attr cdatasection characterdata comment \ - document document_type doc_fragment \ - element entity_ref implementation impllist \ - namednodemap node nodelist \ - pi string text - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix ../Release/, $(addsuffix .o, $(OBJS))) - -debug: $(addprefix ../Debug/, $(addsuffix .o, $(OBJS))) - -clean: - -@${RM} ${RMFLAGS} $(addprefix ../Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix ../Debug/, $(addsuffix .o, ${OBJS})) - -distclean: - -setup: - -export: - -test: - -# Pattern rules -../Release/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c ${CFLAGS} -DNDEBUG -o $@ $< - -../Debug/%.o: %.c - @${ECHO} ${ECHOFLAGS} "==> $<" - @${CC} -c -g ${CFLAGS} -o $@ $< +# Sources +DIR_SOURCES := attr.c cdatasection.c characterdata.c comment.c \ + document.c document_type.c doc_fragment.c \ + element.c entity_ref.c implementation.c impllist.c \ + namednodemap.c node.c nodelist.c \ + pi.c string.c text.c + +include build/makefiles/Makefile.subdir diff --git a/src/utils/Makefile b/src/utils/Makefile index 29369ae..c80f261 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -1,53 +1,4 @@ -# 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 +# Sources +DIR_SOURCES := namespace.c -# Manipulate include paths -CFLAGS += -I$(CURDIR) - -# Objects -OBJS = namespace - -.PHONY: clean debug distclean export release setup test - -# Targets -release: $(addprefix ../Release/, $(addsuffix .o, $(OBJS))) - -debug: $(addprefix ../Debug/, $(addsuffix .o, $(OBJS))) - -clean: - -@${RM} ${RMFLAGS} $(addprefix ../Release/, $(addsuffix .o, ${OBJS})) - -@${RM} ${RMFLAGS} $(addprefix ../Debug/, $(addsuffix .o, ${OBJS})) - -distclean: - -setup: - -export: - -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 -- cgit v1.2.3