[svn:parrot] r45059 - branches/include_dynpmc_makefile/config/gen/makefiles

[darbelo at svn.parrot.org]

Author: darbelo
Date: Fri Mar 19 12:06:43 2010
New Revision: 45059
URL: https://trac.parrot.org/parrot/changeset/45059

Log:
Eradicate all traces of the old makefile and enable the new includes.

Modified:
   branches/include_dynpmc_makefile/config/gen/makefiles/root.in

Modified: branches/include_dynpmc_makefile/config/gen/makefiles/root.in
==============================================================================
--- branches/include_dynpmc_makefile/config/gen/makefiles/root.in	Fri Mar 19 12:04:42 2010	(r45058)
+++ branches/include_dynpmc_makefile/config/gen/makefiles/root.in	Fri Mar 19 12:06:43 2010	(r45059)
@@ -68,6 +68,7 @@
 
 PERL             = @perl@
 CP               = @cp@
+MV               = @mv@
 CHMOD            = @chmod@
 MKPATH           = @mkpath@
 RM_F             = @rm_f@
@@ -115,6 +116,7 @@
 NONGEN_HEADERS   = @TEMP_nongen_headers@
 
 include src/dynoplibs/Defines.mak
+include src/dynpmc/Defines.mak
 include compilers/imcc/Defines.mak
 include compilers/pirc/Defines.mak
 include compilers/tge/Defines.mak
@@ -145,7 +147,8 @@
     ext/Makefile \
     src/dynoplibs/Rules.mak \
     src/dynoplibs/Defines.mak \
-    src/dynpmc/Makefile \
+    src/dynopmc/Rules.mak \
+    src/dynpmc/Defines.mak \
     compilers/imcc/Rules.mak
 
 GEN_CONFIGS = \
@@ -631,7 +634,7 @@
     runtime/parrot/include/parrotlib.pbc \
     runtime/parrot/include/config.fpmc \
     $(LIBRARY_DIR)/Test/More.pbc \
-    dynpmc \
+    $(DYNPMC_TARGETS) \
     $(DYNOPLIBS_TARGETS)
 
 $(GEN_LIBRARY) : $(PARROT) $(GEN_PASM_INCLUDES)
@@ -681,6 +684,7 @@
 H2INC = $(BUILD_TOOLS_DIR)/h2inc.pl
 
 # classes PMC build utils and rules
+PMC2C  = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl @no_lines_flag@
 PMC2CD = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump @no_lines_flag@
 PMC2CC = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c @no_lines_flag@
 PMC2CV = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --vtable @no_lines_flag@
@@ -769,11 +773,6 @@
 	@echo "  svnclobber:        *Dangerous*: remove everything not in svn."
 	@echo "  reconfig:          'clean' and redo configuration."
 	@echo ""
-	@echo "Dynamic PMCs:"
-	@echo "  dynpmc:            Proxy for default target of src/dynpmc/Makefile"
-	@echo "  dynpmc-test:       Proxy for target 'test' of src/dynpmc/Makefile"
-	@echo "  dynpmc-clean:      Proxy for target 'clean' of src/dynpmc/Makefile"
-	@echo ""
 	@echo "Fetch from source repository:"
 	@echo "  update:            svn update."
 	@echo "  status:            svn status."
@@ -1571,24 +1570,6 @@
 
 ###############################################################################
 #
-# dynamic PMC targets:
-#
-###############################################################################
-
-dynpmc : dynpmc.dummy
-
-# XXX this dependancy is too broad, and should be narrowed down
-dynpmc.dummy : $(PARROT) $(INC_DIR)/parrot.h $(INC_DIR)/extend.h $(INC_DIR)/dynext.h $(PMC2C_FILES)
-	$(MAKE) src/dynpmc
-
-dynpmc-test : $(PARROT) $(INC_DIR)/parrot.h $(INC_DIR)/extend.h $(INC_DIR)/dynext.h
-	$(MAKE) src/dynpmc test
-
-dynpmc-clean :
-	$(MAKE) src/dynpmc clean
-
-###############################################################################
-#
 # compiler implementation targets:
 #
 ###############################################################################
@@ -1818,7 +1799,6 @@
     dynext-clean \
 #IF(has_perldoc):    docs-clean \
 #IF(has_perldoc):    html-clean \
-    dynpmc-clean \
     examples-clean \
     ext-clean \
 #UNLESS(win32):    cover-clean \
@@ -1831,7 +1811,8 @@
 	$(RM_RF) lib/Parrot/OpLib
 	$(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS) $(JSON_CLEANUPS)
 	$(RM_F) $(PIRC_CLEANUPS) $(PCT_CLEANUPS) $(DATA_JSON_CLEANUPS)
-	$(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES) $(DYNOPLIBS_CLEANUPS)
+	$(RM_F) $(DYNOPLIBS_CLEANUPS) $(DYNPMC_CLEANUPS)
+	$(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES)
 
 prog-clean :
 	$(RM_F) \
@@ -2531,6 +2512,7 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
 
 include src/dynoplibs/Rules.mak
+include src/dynpmc/Rules.mak
 include runtime/parrot/library/Rules.mak
 include compilers/imcc/Rules.mak
 include compilers/pirc/Rules.mak