Fix up bindings buildsystem to permit multiple bindings to be built -- quite why this wasn't done in the first place is currently beyond me.

Tidy up XML binding -- ensure all public API is prefixed dom_xml_ to avoid confusion, remove xml_alloc (it's pointless), and move xml_msg to <dom/functypes.h> (as dom_msg, as it's more useful there)
Fix up testobject to compile once more

svn path=/trunk/dom/; revision=3643

1 files changed, 7 insertions, 35 deletions

diff --git a/bindings/Makefile b/bindings/Makefile
index 5f1ea53..e552f84 100644
--- a/bindings/Makefile
+++ b/bindings/Makefile
@@ -18,55 +18,27 @@
 # setup      Perform any setup required prior to compilation
 # test       Execute any test cases
 
-# Manipulate include paths
-CFLAGS += -I$(CURDIR)
-
-# Release output
-RELEASE = ${TOP}/${COMPONENT}-libxml.a
-
-# Debug output
-DEBUG = ${TOP}/${COMPONENT}-libxml-debug.a
-
-# Objects
-OBJS = 
-
 .PHONY: clean debug distclean export release setup test
 
 # Targets
-release: $(addprefix Release/, $(addsuffix .o, $(OBJS)))
+release:
 	@${MAKE} -C xml release
-	@${AR} ${ARFLAGS} $(RELEASE) Release/*
 
-debug: $(addprefix Debug/, $(addsuffix .o, $(OBJS)))
+debug: 
 	@${MAKE} -C xml debug
-	@${AR} ${ARFLAGS} $(DEBUG) Debug/*
 
 clean:
 	@${MAKE} -C xml 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
+	@${MAKE} -C xml distclean
 
 setup:
-	@${MKDIR} ${MKDIRFLAGS} Release
-	@${MKDIR} ${MKDIRFLAGS} Debug
+	@${MAKE} -C xml setup
 
 export:
-	@${CP} ${CPFLAGS} $(RELEASE) ${EXPORT}/lib/
+	@${MAKE} -C xml export
 
 test:
+	@${MAKE} -C xml test
 
-# Pattern rules
-Release/%.o: %.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c ${CFLAGS} -DNDEBUG -o $@ $<
-
-Debug/%.o: %.c
-	@${ECHO} ${ECHOFLAGS} "==> $<"
-	@${CC} -c -g ${CFLAGS} -o $@ $<