[svn:parrot] r43402 - in branches/one_make: compilers/pct config/gen/makefiles ext/nqp-rx

[coke at svn.parrot.org]

Author: coke
Date: Thu Jan  7 02:34:53 2010
New Revision: 43402
URL: https://trac.parrot.org/parrot/changeset/43402

Log:
minor dep cleanup, fix 'corevm', rename some vars.
pct_complete_workflow should now pass.

Modified:
   branches/one_make/compilers/pct/Defines.mak
   branches/one_make/config/gen/makefiles/root.in
   branches/one_make/ext/nqp-rx/Rules.mak

Modified: branches/one_make/compilers/pct/Defines.mak
==============================================================================
--- branches/one_make/compilers/pct/Defines.mak	Wed Jan  6 22:00:18 2010	(r43401)
+++ branches/one_make/compilers/pct/Defines.mak	Thu Jan  7 02:34:53 2010	(r43402)
@@ -4,3 +4,5 @@
     $(LIBRARY_DIR)/PCT/Grammar.pbc \
     $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
     $(LIBRARY_DIR)/PCT/Dumper.pbc 
+
+PCT_CLEANUPS = $(PCT_LIB_PBCS)

Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in	Wed Jan  6 22:00:18 2010	(r43401)
+++ branches/one_make/config/gen/makefiles/root.in	Thu Jan  7 02:34:53 2010	(r43402)
@@ -239,10 +239,6 @@
     lib/Parrot/OpLib/core.pm
 
 GEN_LIBRARY = \
-    $(TGE_LIB_PBCS) \
-    $(PGE_LIB_PBCS) \
-    $(PCT_LIB_PBCS) \
-    $(JSON_LIB_PBCS) \
     $(LIBRARY_DIR)/CGI/QueryHash.pbc \
     $(LIBRARY_DIR)/Crow.pbc \
     $(LIBRARY_DIR)/config.pbc \
@@ -499,7 +495,7 @@
 PBC_TO_EXE          = ./pbc_to_exe$(EXE)
 PARROT_CONFIG       = ./parrot_config$(EXE)
 PIRC                = ./pirc$(EXE)
-NQP                 = ./parrot-nqp$(EXE)
+NQP_RX              = ./parrot-nqp$(EXE)
 
 # Installable executables
 INSTALLABLEPARROT   = ./installable_parrot$(EXE)
@@ -564,10 +560,6 @@
 .pir.pbc : # suffix rule (limited support)
 	$(PARROT) -o $@ $<
 
-.pbc$(O) : # suffix rule (limited support)
-	$(PARROT) -o $@ $<
-
-
 ###############################################################################
 #
 # USER TARGETS:
@@ -586,7 +578,12 @@
     $(PBCMERGE) \
     $(PDB) \
     $(PDUMP) \
-    $(NQP)
+    $(NQP_RX) \
+    $(TGE_LIB_PBCS) \
+    $(PGE_LIB_PBCS) \
+    $(PCT_LIB_PBCS) \
+    $(JSON_LIB_PBCS) \
+    $(NQP_LIB_PBCS)
 
 corevm : \
     flags_dummy \
@@ -1687,7 +1684,7 @@
 	$(RM_F) $(FLUID_FILES_2)
 	$(RM_RF) lib/Parrot/OpLib
 	$(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS) $(JSON_CLEANUPS)
-	$(RM_F) $(PIRC_CLEANUPS)
+	$(RM_F) $(PIRC_CLEANUPS) $(PCT_CLEANUPS)
 
 prog-clean :
 	$(RM_F) \

Modified: branches/one_make/ext/nqp-rx/Rules.mak
==============================================================================
--- branches/one_make/ext/nqp-rx/Rules.mak	Wed Jan  6 22:00:18 2010	(r43401)
+++ branches/one_make/ext/nqp-rx/Rules.mak	Thu Jan  7 02:34:53 2010	(r43402)
@@ -16,7 +16,7 @@
 parrot-nqp.pbc : $(LIBRARY_DIR)/nqp-rx.pbc
 	$(CP) $(LIBRARY_DIR)/nqp-rx.pbc $@
 
-$(NQP) : $(NQPRX_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc
+$(NQP_RX) : $(NQPRX_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc
 	$(PBC_TO_EXE) parrot-nqp.pbc
 
 $(INSTALLABLENQP) : $(NQPRX_LIB_PBCS) $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE) parrot-nqp.pbc