Changeset 2174 for trunk/symbol_table

Timestamp:

May 28, 2012, 2:24:15 PM (7 years ago)

Author:

ksherdy

Message:

Moved pablo src to pablo dir.

Location:

trunk/symbol_table

Files:

• Makefile (modified) (3 diffs)
• bit_byte_group_strms.py (deleted)
• bitutil.py (deleted)
• demo_strms.py (deleted)
• div2_group_strms.py (deleted)
• div2_logbase2_group_strms.py (deleted)
• hash_strms.py (deleted)
• id_group_strms.py (deleted)
• logbase2_group_strms.py (deleted)
• marker_strms.py (deleted)
• pablo (added)
• pablo/bit_byte_group_strms.py (added)
• pablo/bitutil.py (added)
• pablo/demo_strms.py (added)
• pablo/div2_group_strms.py (added)
• pablo/div2_logbase2_group_strms.py (added)
• pablo/hash_strms.py (added)
• pablo/id_group_strms.py (added)
• pablo/logbase2_group_strms.py (added)
• pablo/marker_strms.py (added)

trunk/symbol_table/Makefile

@@ -13 +13 @@
 endif
 
+PABLO_SRC=pablo
 #PABLO_COMPILER=../../proto/Compiler/pablomain.py
 PABLO_COMPILER=Compiler/pablomain.py 
@@ -18 +19 @@
 
 MARKER_PREFIX=@marker_strms_
-MARKER_PABLO_SRC=marker_strms.py
+MARKER_PABLO_SRC=$(PABLO_SRC)/marker_strms.py
 MARKER_TEMPLATE=marker_strms_template.hpp
 MARKER_OUTFILE=src/marker_strms.hpp
 
 HASH_PREFIX=@hash_strms_
-HASH_PABLO_SRC=hash_strms.py
+HASH_PABLO_SRC=$(PABLO_SRC)/hash_strms.py
 HASH_TEMPLATE=hash_strms_template.hpp
 HASH_OUTFILE=src/hash_strms.hpp
 
-ID_GROUP_STRMS = id_group_strms.py
-DIV2_GROUP_STRMS = div2_group_strms.py
-LOGBASE2_GROUP_STRMS = logbase2_group_strms.py
-DIV2_LOGBASE2_GROUP_STRMS = div2_logbase2_group_strms.py
-BIT_BYTE_GROUP_STRMS = bit_byte_group_strms.py
+ID_GROUP_STRMS = $(PABLO_SRC)/id_group_strms.py
+DIV2_GROUP_STRMS = $(PABLO_SRC)/div2_group_strms.py
+LOGBASE2_GROUP_STRMS = $(PABLO_SRC)/logbase2_group_strms.py
+DIV2_LOGBASE2_GROUP_STRMS = $(PABLO_SRC)/div2_logbase2_group_strms.py
+BIT_BYTE_GROUP_STRMS = $(PABLO_SRC)/bit_byte_group_strms.py
 
 GROUP_PREFIX=@group_strms_
@@ -58 +59 @@
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2: markers hash div2_group src/main.cpp
+div2: markers $(MARKER_PABLO_SRC) src/main.cpp
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-logbase2: markers hash logbase2_group src/main.cpp
+logbase2: $(MARKER_PABLO_SRC)_group src/main.cpp
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2_logbase2: markers hash div2_logbase2_group src/main.cpp
+div2_logbase2: $(MARKER_PABLO_SRC) src/main.cpp
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-bit_byte: markers hash bit_byte_group src/main.cpp
+bit_byte: $(MARKER_PABLO_SRC)_group src/main.cpp
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-markers: marker_strms.py marker_strms_template.hpp
+markers: $(MARKER_PABLO_SRC) marker_strms_template.hpp
         python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MARKER_TEMPLATE) -l $(MARKER_PREFIX) -o $(MARKER_OUTFILE) $(PABLO_ADD_DEBUG)
 
-hash: hash_strms.py hash_strms_template.hpp
+hash: $(PABLO_SRC)/hash_strms.py hash_strms_template.hpp
         python $(PABLO_COMPILER) $(HASH_PABLO_SRC) -t $(HASH_TEMPLATE) -l $(HASH_PREFIX) -o $(HASH_OUTFILE) $(PABLO_ADD_DEBUG)
 
-id_group: id_group_strms.py group_strms_template.hpp main_template.cpp
+id_group: $(PABLO_SRC)/id_group_strms.py group_strms_template.hpp main_template.cpp
         python $(PABLO_COMPILER) $(ID_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
         python $(PABLO_COMPILER) $(ID_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2_group: div2_group_strms.py group_strms_template.hpp main_template.cpp
+div2_group: $(PABLO_SRC)/div2_group_strms.py group_strms_template.hpp main_template.cpp
         python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
         python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-logbase2_group: logbase2_group_strms.py group_strms_template.hpp main_template.cpp
+logbase2_group: $(PABLO_SRC)/logbase2_group_strms.py group_strms_template.hpp main_template.cpp
         python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
         python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2_logbase2_group: div2_logbase2_group_strms.py group_strms_template.hpp main_template.cpp
+div2_logbase2_group: $(PABLO_SRC)/div2_logbase2_group_strms.py group_strms_template.hpp main_template.cpp
         python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
         python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-bit_byte_group: bit_byte_group_strms.py group_strms_template.hpp main_template.cpp
+bit_byte_group: $(PABLO_SRC)/bit_byte_group_strms.py group_strms_template.hpp main_template.cpp
         python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
         python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)