Merge commit 'nima/xml'

Conflicts:
	debian/changelog
		Had the same changelog entry in both xml and master
		branch, with a minor wording difference.  Removed the
		duplicate and merged in the changelog entries from the
		XML branch

	src/dmidecode.c
		Merge process got confused by some functions which was not
		changed.  Removed the code coming from the master branch and
		let the XML be the base.

	src/setup-dbg.py
	src/setup.py
		In the XML branch, the version of the python-dmidecode is
		now a function which retrieves the version number from
		src/version.h.  Merged in this feature to master as well.

1 files changed, 34 insertions, 0 deletions

diff --git a/unit-tests/Makefile b/unit-tests/Makefile
new file mode 100644
index 0000000..01706a3
--- /dev/null
+++ b/unit-tests/Makefile
@@ -0,0 +1,34 @@
+## This one is important to get right ...
+## We need to link in the libxml2mod.so file from here
+PYLIBDIR := /usr/lib64/python2.5/site-packages
+PYLIBDIR := /usr/lib/python-support/python-libxml2/python2.5
+
+# Defaults, should be fine
+CFLAGS=-I. $(shell xml2-config --cflags) -g -Wall $(shell python-config --cflags)
+
+LIBS=$(shell xml2-config --libs) -lxml2mod $(shell python-config --libs)
+LIBDIR=-L $(PYLIBDIR)
+
+.SUFFIX=.c .o .so
+
+all : test
+
+demomodule.so : demo.o dmixml.o
+	@echo "Linking: $@"
+	@gcc -fPIC --shared -o $@ $^ $(LIBS) $(LIBDIR)
+
+.c.o :
+	@echo "Compiling $<"
+	@gcc -fPIC -c $< $(CFLAGS)
+
+#test : demomodule.so
+test :
+	@echo "=========================================="
+	@echo " Running proof-of-concept code"
+	@echo "=========================================="
+	@echo ""
+	@python unit
+
+clean :
+	rm -f *.{py[oc],o,so} *~
+