fix codegen and codegen/tests generate/compile order

Utilities/codegen/Makefile.am

-SUBDIRS=tests
+SUBDIRS=. tests
 
 bin_SCRIPTS = @PACKAGE@-codegen
 

Utilities/codegen/tests/Makefile.am

@@ -2,9 +2,13 @@ noinst_PROGRAMS 	= test
 test_LDADD 		= $(top_builddir)/lib/libUniSet.la
 test_SOURCES 	= TestGen_SK.cc TestGen.cc TestGen-main.cc
 
-TestGen_SK.cc TestGen-main.cc: ../@PACKAGE@-codegen testgen.src.xml ../*.xsl
-	chmod 'a+x' ../@PACKAGE@-codegen
-	./testgen.sh
+GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc
+
+$(GENERATED): ../@PACKAGE@-codegen testgen.src.xml ../*.xsl
+	sh ../uniset-codegen --local-include -l --path ../ --ask -n TestGen testgen.src.xml
 
 clean-local:
-	rm -rf *_SK.cc *_SK.h *-main.cc
\ No newline at end of file
+	rm -rf $(GENERATED)
+
+all-local: $(GENERATED)
+	

Utilities/codegen/tests/testgen.sh

-#!/bin/sh
-
-cd ..
-
-./uniset-codegen --local-include -l --ask -n TestGen tests/testgen.src.xml
-mv -f TestGen* tests/
-
-cd -
\ No newline at end of file