--- messaging/manakai/t/Makefile	2006/02/19 07:06:16	1.15
+++ messaging/manakai/t/Makefile	2006/02/26 06:42:58	1.16
@@ -4,9 +4,10 @@
 MANAKAI_TEST_DIR = $(MANAKAI_ROOT_DIR)t/
 
 DIS_SUFFIX = .dis
-DAC_SUFFIX = .dae
-DAEM_SUFFIX = .daem
+DAEM_SUFFIX = .dafm
+DAFX_SUFFIX = .dafx
 PM_SUFFIX = .pm
+PT_SUFFIX = .t
 
 CD = cd
 MAKE = make
@@ -20,22 +21,29 @@
 INST_ARCHLIB = $(MANAKAI_ROOT_DIR)blib/arch
 INST_LIB = $(MANAKAI_ROOT_DIR)blib/lib
 
-PERL_OPTIONS =
 PERL = perl
-PERL_ = $(PERL) $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
-PERLC = $(PERL) -c
-PERLC_ = $(PERLC) $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
-PERL_TEST_ = $(PERL) \
-             $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR) \
+PERL_OPTIONS =
+PERL_OPTIONS_ALL = $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
+PERL_ = $(PERL) $(PERL_OPTIONS_ALL)
+PERLC = $(PERL) -c -w
+PERLC_OPTIONS = 
+PERLC_OPTIONS_ALL = $(PERLC_OPTIONS) -I$(MANAKAI_LIB_DIR)
+PERL_CHK = $(PERLC) $(PERLC_OPTIONS_ALL)
+PERL_TEST_ = $(PERL) $(PERL_OPTIONS_ALL) \
              -MExtUtils::Command::MM \
              -e "test_harness ($(TEST_VERBOSE), '$(INST_LIB)', \
                                       '$(INST_ARCHLIB)')"
 
 DIS_OPTIONS = 
 DIS_OPTIONS_ALL = $(DIS_OPTIONS) \
-  --search-path-catalog-file-name="$(MANAKAI_LIB_DIR)manakai/dis-catalog" \
-  --dis-file-suffix="$(DIS_SUFFIX)" \
-  --daem-file-suffix="$(DAEM_SUFFIX)"
+      --search-path-catalog-file-name="$(MANAKAI_LIB_DIR)manakai/dis-catalog" \
+      --dis-file-suffix="$(DIS_SUFFIX)" \
+      --daem-file-suffix="$(DAEM_SUFFIX)" \
+      --dafx-file-suffix="$(DAFX_SUFFIX)"
+
+DAF_OPTIONS =
+DAF_PL = $(MANAKAI_BIN_DIR)daf.pl
+DAF = $(PERL_) $(DAF_PL) $(DAF_OPTIONS) $(DIS_OPTIONS_ALL)
 
 DOMTEST_TESTS_DIR = $(MANAKAI_ROOT_DIR)../domts/tests/
 DOMTEST_PERL_DIR = $(MANAKAI_TEST_DIR)dom/
@@ -45,34 +53,29 @@
 DOMTS2PERL = $(PERL_) -I$(MANAKAI_BIN_DIR) $(DOMTS2PERL_PL)
 DOMTEST2PERL_PL = $(MANAKAI_BIN_DIR)domtest2perl.pl
 
-DAC2TEST_OPTIONS = 
-DAC2TEST_PL = $(MANAKAI_BIN_DIR)dac2test.pl
-DAC2TEST = $(PERL_) $(DAC2TEST_PL) $(DAC2TEST_OPTIONS) $(DIS_OPTIONS_ALL)
-
-DOM_FEATURE_DAC = $(MANAKAI_LIB_DIR)Message/DOM/feature$(DAC_SUFFIX)
-DOM_CORE_DAC = $(MANAKAI_LIB_DIR)Message/DOM/core$(DAC_SUFFIX)
-DOM_LS_DAC = $(MANAKAI_LIB_DIR)Message/DOM/ls$(DAC_SUFFIX)
-DOM_XP_DAC = $(MANAKAI_LIB_DIR)Message/DOM/xp$(DAC_SUFFIX)
-DOM_DAC_FILES = $(DOM_FEATURE_DAC) $(DOM_CORE_DAC) $(DOM_LS_DAC) $(DOM_XP_DAC)
-
-UTIL_TEST_DAC = $(MANAKAI_LIB_DIR)Message/Util/coretest$(DAC_SUFFIX)
-UTIL_MNTEST_PM = $(MANAKAI_LIB_DIR)Message/Util/ManakaiNodeTest$(PM_SUFFIX)
-UTIL_PC_DAC = $(MANAKAI_LIB_DIR)Message/Util/pc$(DAC_SUFFIX)
-DIS_CORE_DAC = $(MANAKAI_LIB_DIR)Message/Util/discore$(DAC_SUFFIX)
-
 NS_MDOM = http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom\#ManakaiDOM.
 NS_MANAKAIDOM = http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom\#
-NS_UTIL = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/
-NS_DIS  = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS\#
+NS_UTIL       = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/
+NS_UTIL_DIS   = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS\#
+
+NS_MDOM_PT_FILES = \
+  dom-DOMFeature$(PT_SUFFIX) dom-GenericLS$(PT_SUFFIX) \
+  dom-DOMCore$(PT_SUFFIX) dom-Tree$(PT_SUFFIX) \
+  dom-DOMXML$(PT_SUFFIX) dom-XDoctype$(PT_SUFFIX) \
+  dom-DOMLS$(PT_SUFFIX) dom-XMLParser$(PT_SUFFIX) \
+  dom-ManakaiDOMLS2003$(PT_SUFFIX)
+NS_UTIL_PT_FILES = \
+  util-ManakaiNodeTest$(PT_SUFFIX) \
+  util-PerlCode$(PT_SUFFIX) \
+  util-DIS$(PT_SUFFIX)
+NS_UTIL_DIS_PT_FILES = \
+  util-dis-DNLite$(PT_SUFFIX)
+
+PT_FILES = \
+  $(NS_MDOM_PT_FILES) \
+  $(NS_UTIL_PT_FILES) $(NS_UTIL_DIS_PT_FILES)
 
-GENERATED_FILES = \
-  util-mntest.t \
-  dom-feature.t dom-genericls.t \
-  dom-core.t dom-tree.t dom-xml.t dom-xdoctype.t \
-  dom-ls.t dom-xmlparser.t \
-  dom-mdomls2003.t \
-  util-dis.t util-dis-dnlite.t \
-  util-perlcode.t
+GENERATED_FILES = $(PT_FILES)
 
 all: $(GENERATED_FILES)
 
@@ -88,78 +91,45 @@
 
 test-module-all: test-module-dom test-module-util
 
-test-module-dom: \
-  dom-feature.t dom-genericls.t \
-  dom-core.t dom-tree.t dom-xml.t dom-xdoctype.t \
-  dom-ls.t dom-mdomls2003.t dom-xmlparser.t
+test-module-dom: $(NS_MDOM_PT_FILES)
 	$(PERL_TEST_) dom-*.t
 
-dom-feature.t: $(DOM_FEATURE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMFeature" > $@
+$(NS_MDOM_PT_FILES): dom-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/DOM/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_MDOM)$* $@"
+	$(ECHO) "BEGIN {" >> $@
+	$(ECHO) "  require 'manakai/mndebug.pl';" >> $@
+	$(ECHO) "  manakai::mndebug::define_nodestem_destroy ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_nodestem_destroy_all ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_noderef_destroy_all ();" >> $@
+	$(ECHO) "}" >> $@
+	$(PERL_CHK) $@
 
-dom-genericls.t: $(DOM_FEATURE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)GenericLS" > $@
-
-dom-core.t: $(DOM_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMCore" > $@
-
-dom-tree.t: $(DOM_CORE_DAC) $(DAC2TEST_PL) Makefile
-	$(ECHO) "require 'manakai/mndebug.pl';" > $@
-	$(ECHO) "manakai::mndebug::define_nodestem_destroy ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_nodestem_destroy_all ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_noderef_destroy_all ();" >> $@
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)Tree" >> $@
-
-dom-xml.t: $(DOM_CORE_DAC) $(DAC2TEST_PL) Makefile
-	$(ECHO) "require 'manakai/mndebug.pl';" > $@
-	$(ECHO) "manakai::mndebug::define_nodestem_destroy ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_nodestem_destroy_all ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_noderef_destroy_all ();" >> $@
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMXML" >> $@
-
-dom-xdoctype.t: $(DOM_CORE_DAC) $(DAC2TEST_PL) Makefile
-	$(ECHO) "require 'manakai/mndebug.pl';" > $@
-	$(ECHO) "manakai::mndebug::define_nodestem_destroy ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_nodestem_destroy_all ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_noderef_destroy_all ();" >> $@
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)XDoctype" >> $@
-
-dom-ls.t: $(DOM_LS_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMLS" > $@
-
-dom-mdomls2003.t: $(DOM_LS_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)ManakaiDOMLS2003" > $@
-
-dom-xmlparser.t: $(DOM_XP_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)XMLParser" > $@
-
-test-module-util: \
-  util-mntest.t \
-  util-perlcode.t \
-  util-dis.t util-dis-dnlite.t
+test-module-util: $(NS_UTIL_PT_FILES) $(NS_UTIL_DIS_PT_FILES)
 	$(PERL_TEST_) util-*.t
 
-util-mntest.t: $(UTIL_TEST_DAC) $(UTIL_MNTEST_PM) $(DAC2TEST_PL) Makefile
-	$(ECHO) "require 'manakai/mndebug.pl';" > $@
-	$(ECHO) "manakai::mndebug::define_nodestem_destroy ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_nodestem_destroy_all ();" >> $@
-	#$(ECHO) "manakai::mndebug::define_noderef_destroy_all ();" >> $@
-	$(DAC2TEST) $< --source-module="$(NS_UTIL)ManakaiNodeTest" >> $@
-
-util-perlcode.t: $(UTIL_PC_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_UTIL)PerlCode" > $@
-
-util-dis.t: $(DIS_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_UTIL)DIS" > $@
-
-util-dis-dnlite.t: $(DIS_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_DIS)DNLite" > $@
-
-$(DOM_DAC_FILES): $(MANAKAI_LIB_DIR)Message/DOM/%: always
-	$(CD) $(MANAKAI_LIB_DIR)Message/DOM/ && $(MAKE) $*
+$(NS_UTIL_PT_FILES): util-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL)$* $@"
+	$(PERL_CHK) $@
+
+util-ManakaiNode$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/%$(DIS_SUFFIX) $(UTIL_MNTEST_PM) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL)$* $@"
+	$(ECHO) "BEGIN {" >> $@
+	$(ECHO) "  require 'manakai/mndebug.pl';" >> $@
+	$(ECHO) "  manakai::mndebug::define_nodestem_destroy ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_nodestem_destroy_all ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_noderef_destroy_all ();" >> $@
+	$(ECHO) "}" >> $@
+	$(PERL_CHK) $@
+
+$(NS_UTIL_DIS_PT_FILES): util-dis-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/DIS/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL_DIS)$* $@"
+	$(PERL_CHK) $@
 
-$(UTIL_TEST_DAC) $(UTIL_MNTEST_PM) $(UTIL_PC_DAC) $(DIS_CORE_DAC): \
-  $(MANAKAI_LIB_DIR)Message/Util/%: always
+$(UTIL_MNTEST_PM): $(MANAKAI_LIB_DIR)Message/Util/%: always
 	$(CD) $(MANAKAI_LIB_DIR)Message/Util/ && $(MAKE) $*
 
 clean: clean-dom1core-perl