--- a/Makefile.in	Wed Aug 08 01:43:02 2007 +0200
+++ b/Makefile.in	Wed Aug 08 08:51:09 2007 +0200
@@ -21,7 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # 
 
-all: objdictgen canfestival examples
+all: objdictedit canfestival examples
 
 examples: canfestival driver
 	$(MAKE) -C examples all
@@ -32,7 +32,7 @@
 manual:
 	$(MAKE) -C doc/manual
 
-objdictgen:
+objdictedit:
 	$(MAKE) -C objdictgen all
 
 canfestival: driver

--- a/objdictgen/Makefile.in	Wed Aug 08 01:43:02 2007 +0200
+++ b/objdictgen/Makefile.in	Wed Aug 08 08:51:09 2007 +0200
@@ -25,13 +25,14 @@
 
 all: gnosis
 
-gnosis: Gnosis_Utils-1.2.1.tar.gz
+gnosis: Gnosis_Utils-current.tar.gz
 
-Gnosis_Utils-1.2.1.tar.gz:
-	wget http://gnosis.cx/download/Gnosis_Utils-1.2.1.tar.gz
-	tar xfz Gnosis_Utils-1.2.1.tar.gz
-	mv Gnosis_Utils-1.2.1/gnosis .
-	rm -rf Gnosis_Utils-1.2.1
+Gnosis_Utils-current.tar.gz:
+	wget http://gnosis.cx/download/Gnosis_Utils-current.tar.gz
+	mkdir -p gnosis_extract
+	tar xzof Gnosis_Utils-current.tar.gz -C gnosis_extract
+	mv gnosis_extract/Gnosis_Utils-*/gnosis .
+	rm -rf gnosis_extract
 
 install: gnosis
 	mkdir -p $(PREFIX)/objdictgen
@@ -51,7 +52,7 @@
 clean:
 
 mrproper: clean
-	rm -f Gnosis_Utils-1.2.1.tar.gz
+	rm -f Gnosis_Utils-current.tar.gz
 	rm -rf gnosis
 
 

--- a/objdictgen/nodelist.py	Wed Aug 08 01:43:02 2007 +0200
+++ b/objdictgen/nodelist.py	Wed Aug 08 08:51:09 2007 +0200
@@ -21,10 +21,6 @@
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from gnosis.xml.pickle import *
-from gnosis.xml.pickle.util import setParanoia
-setParanoia(0)
-
 from node import *
 import eds_utils
 import os, shutil