--- messaging/manakai/lib/Makefile	2005/04/30 06:52:21	1.2
+++ messaging/manakai/lib/Makefile	2005/05/01 12:44:05	1.3
@@ -11,6 +11,8 @@
 
 MKDIR = mkdir
 RM = rm
+MAKE = make
+CD = cd
 
 PERL = perl
 PERL1 = $(PERL) -I$(MANAKAI_LIB_DIR)
@@ -35,13 +37,20 @@
       $(DAC_PL) \
       --search-path-catalog-file-name="$(MANAKAI_LIB_DIR)manakai/dis-catalog" \
       --db-base-directory-path="$(MANAKAI_ROOT_DIR)" \
+      --implementation-registry-package \
+        "Message::DOM::DOMMetaImpl::ManakaiDOMImplementationRegistryCompat" \
       --output-file-name=
 
 DAC2PM_OPTIONS =
 DAC2PM_PL = $(MANAKAI_BIN_DIR)dac2pm.pl
 DAC2PM = $(PERL2) \
       -MMessage::Util::Error::DOMException \
-      $(DAC2PM_PL) $(DAC2PM_OPTIONS)
+      $(DAC2PM_PL) \
+      --implementation-registry-package \
+        "Message::DOM::DOMMetaImpl::ManakaiDOMImplementationRegistryCompat" \
+      $(DAC2PM_OPTIONS)
+
+PHASE3_PERL_OPTIONS = 
 
 DIS_FILES_FOR_DOMMETAIMPL = \
   $(MANAKAI_LIB_DIR)Message/DOM/DOMBoot.dis \
@@ -70,9 +79,7 @@
   $(TEMP_LIB_DIR)Message/Util/PerlCode.pm \
   $(TEMP_LIB_DIR)Message/Util/DIS.pm
 
-GENERATED_FILES = $(TEMP_LIB_DIR) $(PHASE1_PM_FILES) \
-  \
-  $(TEMP_LIB2_DIR) \
+PHASE2_PM_FILES = \
   $(TEMP_LIB2_DIR)Message/Util/ManakaiNode.pm \
   $(TEMP_LIB2_DIR)Message/DOM/DOMMetaImpl.pm \
   $(TEMP_LIB2_DIR)Message/Markup/SuikaWikiConfig21.pm \
@@ -80,7 +87,11 @@
   $(TEMP_LIB2_DIR)Message/Util/PerlCode.pm \
   $(TEMP_LIB2_DIR)Message/Util/DIS.pm
 
-all: $(GENERATED_FILES)
+GENERATED_FILES = $(TEMP_LIB_DIR) $(PHASE1_PM_FILES) \
+  \
+  $(TEMP_LIB2_DIR) $(PHASE2_PM_FILES)
+
+all: $(GENERATED_FILES) phase3
 
 ## Phase 1 - Making Perl modules by old disc and cdis2pm tools
 
@@ -170,8 +181,17 @@
 
 ## Phase 3 - Making Perl modules by dac tools generated by dac tools
 
+phase3: $(PHASE2_PM_FILES)
+	$(CD) $(MANAKAI_LIB_DIR)Message/Util && \
+	  $(MAKE) all \
+	    PERL_OPTIONS="-I../../$(TEMP_LIB2_DIR) -I../../$(MANAKAI_LIB_DIR) \
+	                  $(PHASE3_PERL_OPTIONS)" \
+	    PERLC_OPTIONS="-I../../$(MANAKAI_LIB_DIR) $(PHASE3_PERL_OPTIONS)"
+
+
 ## Misc.
 
 clean:
 	$(RM) -frv $(TEMP_LIB_DIR)
 	$(RM) -fv *~ .*~ *.BAK .*.BAK
+	$(CD) $(MANAKAI_LIB_DIR)Message/Util && $(MAKE) clean