[svn:parrot] r44284 - in trunk: compilers/data_json config/gen/makefiles

[fperrad at svn.parrot.org]

Author: fperrad
Date: Sun Feb 21 23:49:46 2010
New Revision: 44284
URL: https://trac.parrot.org/parrot/changeset/44284

Log:
[build] fix the build of runtime/parrot/library/data_json.pbc on Windows

Modified:
   trunk/compilers/data_json/Defines.mak
   trunk/compilers/data_json/Rules.mak
   trunk/config/gen/makefiles/root.in

Modified: trunk/compilers/data_json/Defines.mak
==============================================================================
--- trunk/compilers/data_json/Defines.mak	Sun Feb 21 21:52:28 2010	(r44283)
+++ trunk/compilers/data_json/Defines.mak	Sun Feb 21 23:49:46 2010	(r44284)
@@ -1,4 +1,6 @@
-DATA_JSON_LIB_PBCS = compilers/data_json/data_json.pbc
-DATA_JSON_CLEANUPS = compilers/data_json/data_json.pbc \
+DATA_JSON_LIB_PBCS = $(LIBRARY_DIR)/data_json.pbc
+
+DATA_JSON_CLEANUPS = $(LIBRARY_DIR)/data_json.pbc \
+    compilers/data_json/data_json.pbc \
     compilers/data_json/data_json/grammar.pir \
     compilers/data_json/data_json/pge2pir.pir

Modified: trunk/compilers/data_json/Rules.mak
==============================================================================
--- trunk/compilers/data_json/Rules.mak	Sun Feb 21 21:52:28 2010	(r44283)
+++ trunk/compilers/data_json/Rules.mak	Sun Feb 21 23:49:46 2010	(r44284)
@@ -1,10 +1,10 @@
 $(LIBRARY_DIR)/data_json.pbc: compilers/data_json/data_json.pbc
 	$(CP) compilers/data_json/data_json.pbc $@
-	
+
 compilers/data_json/data_json.pbc : \
-    runtime/parrot/library/PGE.pbc \
-    runtime/parrot/library/PGE/Util.pbc \
-    runtime/parrot/library/TGE.pbc \
+    $(LIBRARY_DIR)/PGE.pbc \
+    $(LIBRARY_DIR)/PGE/Util.pbc \
+    $(LIBRARY_DIR)/TGE.pbc \
     compilers/data_json/data_json/grammar.pir \
     compilers/data_json/data_json/pge2pir.pir
 

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Sun Feb 21 21:52:28 2010	(r44283)
+++ trunk/config/gen/makefiles/root.in	Sun Feb 21 23:49:46 2010	(r44284)
@@ -283,7 +283,6 @@
     $(LIBRARY_DIR)/Getopt/Obj.pbc \
     $(LIBRARY_DIR)/Iter.pbc \
     $(LIBRARY_DIR)/JSON.pbc \
-    $(LIBRARY_DIR)/data_json.pbc \
     $(LIBRARY_DIR)/Math/Rand.pbc \
     $(LIBRARY_DIR)/MIME/Base64.pbc \
     $(LIBRARY_DIR)/NCI/Utils.pbc \
@@ -617,6 +616,7 @@
     $(PGE_LIB_PBCS) \
     $(PCT_LIB_PBCS) \
     $(JSON_LIB_PBCS) \
+    $(DATA_JSON_LIB_PBCS) \
     $(NQP_LIB_PBCS)
 
 corevm : \
@@ -833,7 +833,7 @@
 	$(PARROT) -o pbc_to_exe.pbc tools/dev/pbc_to_exe.pir
 	$(PARROT) pbc_to_exe.pbc pbc_to_exe.pbc
 
-parrot_nci_thunk_gen.pbc : tools/dev/nci_thunk_gen.pir $(LIBRARY_DIR)/data_json.pbc $(PARROT)
+parrot_nci_thunk_gen.pbc : tools/dev/nci_thunk_gen.pir $(DATA_JSON_LIB_PBCS) $(PARROT)
 	$(PARROT) -o parrot_nci_thunk_gen.pbc tools/dev/nci_thunk_gen.pir
 
 $(NCI_THUNK_GEN) : parrot_nci_thunk_gen.pbc $(PBC_TO_EXE)