Moved most modules into lib

136 files changed, 106 insertions, 110 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cb54d7..229a99d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,82 @@ if (NOT DEFINED BOOSTHOME)
     message( FATAL_ERROR "BOOSTHOME is not set, try use -DBOOSTHOME" )
 endif()
 
-add_subdirectory(chill)
-add_subdirectory(doc)
+find_package(PythonLibs 2.7 REQUIRED)
+find_package(BISON)
+find_package(FLEX)
+
+FLEX_TARGET(ExprScanner src/parse_expr.ll ${CMAKE_CURRENT_BINARY_DIR}/parse_expr.yy.cc COMPILE_FLAGS
+    "--header-file=${CMAKE_CURRENT_BINARY_DIR}/parse_expr.ll.hh") # Hack to avoid generating header in root
+BISON_TARGET(ExprParser src/parse_expr.yy ${CMAKE_CURRENT_BINARY_DIR}/parse_expr.tab.cc COMPILE_FLAGS "-t -d")
+ADD_FLEX_BISON_DEPENDENCY(ExprScanner ExprParser)
+
+string(TIMESTAMP build_date "\\\"%m/%d/%Y\\\"")
+
+set(CORE_LIBS 
+    m rose rt util omega codegen rosecg dl 
+    boost_date_time boost_filesystem boost_program_options
+    boost_regex boost_system boost_wave boost_iostreams)
+
+set(CORE_SRC
+    src/dep.cc
+    src/irtools.cc
+    src/loop.cc
+    src/loop_basic.cc
+    src/loop_datacopy.cc
+    src/loop_extra.cc
+    src/loop_tile.cc
+    src/loop_unroll.cc
+    src/omegatools.cc
+    )
+
+set(IR_CHILL_SRC
+    src/ir_rose.cc
+    src/ir_rose_utils.cc
+    )
+
+set(PYTHON_SRC
+    src/chill_run.cc
+    src/chill_run_util.cc
+    src/chillmodule.cc
+    ${FLEX_ExprScanner_OUTPUTS}
+    ${BISON_ExprParser_OUTPUTS}
+    )
+
+set(COMMON_FLAGS "-DCHILL_BUILD_DATE=\"${build_date}\" -DCHILL_BUILD_VERSION=\"\\\"${CHILL_VERSION}\\\"\"")
 
-if (NOT DEFINED OMEGAHOME)
-    message( WARNING "OMEGAHOME is not set, use bundled omegalib")
-    add_subdirectory(omegalib)
+set(CMAKE_CXX_FLAGS "${COMMON_FLAGS} ${CMAKE_CXX_FLAGS}")
+
+if (DEFINED OMEGAHOME)
+    link_directories(${OMEGAHOME}/lib)
+    set(OMEGA_INC ${OMEGAHOME}/include)
 else()
-    message( WARNING "OMEGAHOME set to ${OMEGAHOME}, use prebuilt omegalib")
+    set(OMEGA_INC 
+        ${CMAKE_CURRENT_SOURCE_DIR}/lib/omega/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/lib/codegen/include
+        )
 endif()
+
+link_directories(${ROSEHOME}/lib ${BOOSTOME}/lib)
+
+include_directories(
+    include
+    lib/rosecg/include
+    ${OMEGA_INC}
+    ${ROSEHOME}/include
+    ${ROSEHOME}/include/rose
+    ${BOOSTHOME}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${PYTHON_INCLUDE_DIRS})
+
+add_executable(chill ${CORE_SRC} ${PYTHON_SRC} ${IR_CHILL_SRC})
+target_link_libraries(chill ${CORE_LIBS} ${PYTHON_LIBRARY})
+add_dependencies(chill omega codegen rosecg)
+
+install(TARGETS chill
+        RUNTIME DESTINATION bin)
+
+add_subdirectory(lib/omega)
+add_subdirectory(lib/codegen)
+add_subdirectory(lib/rosecg)
+
+add_subdirectory(doc)
diff --git a/omegalib/LICENSE b/LICENSE.omega
index f0fbe69..f0fbe69 100644
--- a/omegalib/LICENSE
+++ b/LICENSE.omega
diff --git a/chill/CMakeLists.txt b/chill/CMakeLists.txt
deleted file mode 100644
index 6f58597..0000000
--- a/chill/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-find_package(PythonLibs 2.7 REQUIRED)
-find_package(BISON)
-find_package(FLEX)
-
-FLEX_TARGET(ExprScanner src/parse_expr.ll ${CMAKE_CURRENT_BINARY_DIR}/parse_expr.yy.cc COMPILE_FLAGS
-    "--header-file=${CMAKE_CURRENT_BINARY_DIR}/parse_expr.ll.hh") # Hack to avoid generating header in root
-BISON_TARGET(ExprParser src/parse_expr.yy ${CMAKE_CURRENT_BINARY_DIR}/parse_expr.tab.cc COMPILE_FLAGS "-t -d")
-ADD_FLEX_BISON_DEPENDENCY(ExprScanner ExprParser)
-
-string(TIMESTAMP build_date "\\\"%m/%d/%Y\\\"")
-
-set(CORE_LIBS 
-    m rose rt util omega codegen dl 
-    boost_date_time boost_filesystem boost_program_options
-    boost_regex boost_system boost_wave boost_iostreams)
-
-set(CORE_SRC
-    src/dep.cc
-    src/irtools.cc
-    src/loop.cc
-    src/loop_basic.cc
-    src/loop_datacopy.cc
-    src/loop_extra.cc
-    src/loop_tile.cc
-    src/loop_unroll.cc
-    src/omegatools.cc
-    )
-
-set(IR_CHILL_SRC
-    src/ir_rose.cc
-    src/ir_rose_utils.cc
-    )
-
-set(PYTHON_SRC
-    src/chill_run.cc
-    src/chill_run_util.cc
-    src/chillmodule.cc
-    ${FLEX_ExprScanner_OUTPUTS}
-    ${BISON_ExprParser_OUTPUTS}
-    )
-
-set(COMMON_FLAGS "-DCHILL_BUILD_DATE=\"${build_date}\" -DCHILL_BUILD_VERSION=\"\\\"${CHILL_VERSION}\\\"\"")
-
-set(CMAKE_CXX_FLAGS "${COMMON_FLAGS} ${CMAKE_CXX_FLAGS}")
-
-if (DEFINED OMEGAHOME)
-    link_directories(${OMEGAHOME}/lib)
-    set(OMEGA_INC ${OMEGAHOME}/include)
-else()
-    set(OMEGA_INC 
-        ${PROJECT_SOURCE_DIR}/omegalib/omega/include
-        ${PROJECT_SOURCE_DIR}/omegalib/codegen/include)
-endif()
-
-link_directories(${ROSEHOME}/lib ${BOOSTOME}/lib)
-
-include_directories(
-    include
-    ${OMEGA_INC}
-    ${ROSEHOME}/include
-    ${ROSEHOME}/include/rose
-    ${BOOSTHOME}/include
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${PYTHON_INCLUDE_DIRS})
-
-add_executable(chill ${CORE_SRC} ${PYTHON_SRC} ${IR_CHILL_SRC})
-target_link_libraries(chill ${CORE_LIBS} ${PYTHON_LIBRARY})
-
-if (NOT DEFINED OMEGAHOME)
-    add_dependencies(chill omega codegen)
-endif()
-
-install(TARGETS chill
-        RUNTIME DESTINATION bin)
diff --git a/chill/include/chill_error.hh b/include/chill_error.hh
index 88e49fc..88e49fc 100644
--- a/chill/include/chill_error.hh
+++ b/include/chill_error.hh
diff --git a/chill/include/chill_run_util.hh b/include/chill_run_util.hh
index 8df5871..8df5871 100644
--- a/chill/include/chill_run_util.hh
+++ b/include/chill_run_util.hh
diff --git a/chill/include/chilldebug.h b/include/chilldebug.h
index 865f1f6..865f1f6 100644
--- a/chill/include/chilldebug.h
+++ b/include/chilldebug.h
diff --git a/chill/include/chillmodule.hh b/include/chillmodule.hh
index e83119f..e83119f 100644
--- a/chill/include/chillmodule.hh
+++ b/include/chillmodule.hh
diff --git a/chill/include/dep.hh b/include/dep.hh
index 6c535ce..6c535ce 100644
--- a/chill/include/dep.hh
+++ b/include/dep.hh
diff --git a/chill/include/graph.hh b/include/graph.hh
index 211444a..211444a 100644
--- a/chill/include/graph.hh
+++ b/include/graph.hh
diff --git a/chill/include/ir_code.hh b/include/ir_code.hh
index d695474..d695474 100644
--- a/chill/include/ir_code.hh
+++ b/include/ir_code.hh
diff --git a/chill/include/ir_rose.hh b/include/ir_rose.hh
index 03ea50d..03ea50d 100644
--- a/chill/include/ir_rose.hh
+++ b/include/ir_rose.hh
diff --git a/chill/include/ir_rose_utils.hh b/include/ir_rose_utils.hh
index 350aa24..350aa24 100644
--- a/chill/include/ir_rose_utils.hh
+++ b/include/ir_rose_utils.hh
diff --git a/chill/include/irtools.hh b/include/irtools.hh
index a3b552a..a3b552a 100644
--- a/chill/include/irtools.hh
+++ b/include/irtools.hh
diff --git a/chill/include/loop.hh b/include/loop.hh
index 9620489..9620489 100644
--- a/chill/include/loop.hh
+++ b/include/loop.hh
diff --git a/chill/include/omegatools.hh b/include/omegatools.hh
index b51b2bd..b51b2bd 100644
--- a/chill/include/omegatools.hh
+++ b/include/omegatools.hh
diff --git a/omegalib/codegen/CMakeLists.txt b/lib/codegen/CMakeLists.txt
index 79bdcb4..13bf0fe 100644
--- a/omegalib/codegen/CMakeLists.txt
+++ b/lib/codegen/CMakeLists.txt
@@ -3,19 +3,13 @@ set(CG_SRC
     src/CG.cc
     src/CG_stringBuilder.cc
     src/CG_utils.cc
-
-    src/rose_attributes.cc
-    src/CG_roseBuilder.cc
-    src/CG_roseRepr.cc
     )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
 
 include_directories(
     include
-    ${OMEGAROOT}/omega/include
-    ${ROSEHOME}/include/rose
-    ${BOOSTHOME}/include
+    ${OMEGAROOT}/include
     )
 
 add_library(codegen
diff --git a/omegalib/codegen/include/code_gen/CG.h b/lib/codegen/include/code_gen/CG.h
index ce56768..ce56768 100644
--- a/omegalib/codegen/include/code_gen/CG.h
+++ b/lib/codegen/include/code_gen/CG.h
diff --git a/omegalib/codegen/include/code_gen/CG_outputBuilder.h b/lib/codegen/include/code_gen/CG_outputBuilder.h
index 19dc440..19dc440 100644
--- a/omegalib/codegen/include/code_gen/CG_outputBuilder.h
+++ b/lib/codegen/include/code_gen/CG_outputBuilder.h
diff --git a/omegalib/codegen/include/code_gen/CG_outputRepr.h b/lib/codegen/include/code_gen/CG_outputRepr.h
index 0897007..0897007 100644
--- a/omegalib/codegen/include/code_gen/CG_outputRepr.h
+++ b/lib/codegen/include/code_gen/CG_outputRepr.h
diff --git a/omegalib/codegen/include/code_gen/CG_stringBuilder.h b/lib/codegen/include/code_gen/CG_stringBuilder.h
index 09d3503..09d3503 100644
--- a/omegalib/codegen/include/code_gen/CG_stringBuilder.h
+++ b/lib/codegen/include/code_gen/CG_stringBuilder.h
diff --git a/omegalib/codegen/include/code_gen/CG_stringRepr.h b/lib/codegen/include/code_gen/CG_stringRepr.h
index a6df85d..a6df85d 100644
--- a/omegalib/codegen/include/code_gen/CG_stringRepr.h
+++ b/lib/codegen/include/code_gen/CG_stringRepr.h
diff --git a/omegalib/codegen/include/code_gen/CG_utils.h b/lib/codegen/include/code_gen/CG_utils.h
index a6128bc..a6128bc 100755
--- a/omegalib/codegen/include/code_gen/CG_utils.h
+++ b/lib/codegen/include/code_gen/CG_utils.h
diff --git a/omegalib/codegen/include/code_gen/code_gen.h b/lib/codegen/include/code_gen/code_gen.h
index abfab7c..abfab7c 100644
--- a/omegalib/codegen/include/code_gen/code_gen.h
+++ b/lib/codegen/include/code_gen/code_gen.h
diff --git a/omegalib/codegen/include/code_gen/codegen.h b/lib/codegen/include/code_gen/codegen.h
index cb63bfd..cb63bfd 100755
--- a/omegalib/codegen/include/code_gen/codegen.h
+++ b/lib/codegen/include/code_gen/codegen.h
diff --git a/omegalib/codegen/include/code_gen/codegen_error.h b/lib/codegen/include/code_gen/codegen_error.h
index 06ecc2b..06ecc2b 100755
--- a/omegalib/codegen/include/code_gen/codegen_error.h
+++ b/lib/codegen/include/code_gen/codegen_error.h
diff --git a/omegalib/codegen/include/code_gen/output_repr.h b/lib/codegen/include/code_gen/output_repr.h
index 254e71b..254e71b 100644
--- a/omegalib/codegen/include/code_gen/output_repr.h
+++ b/lib/codegen/include/code_gen/output_repr.h
diff --git a/omegalib/codegen/src/CG.cc b/lib/codegen/src/CG.cc
index 42bd172..42bd172 100644
--- a/omegalib/codegen/src/CG.cc
+++ b/lib/codegen/src/CG.cc
diff --git a/omegalib/codegen/src/CG_stringBuilder.cc b/lib/codegen/src/CG_stringBuilder.cc
index 2f9286f..2f9286f 100644
--- a/omegalib/codegen/src/CG_stringBuilder.cc
+++ b/lib/codegen/src/CG_stringBuilder.cc
diff --git a/omegalib/codegen/src/CG_utils.cc b/lib/codegen/src/CG_utils.cc
index d3a5f71..d3a5f71 100755
--- a/omegalib/codegen/src/CG_utils.cc
+++ b/lib/codegen/src/CG_utils.cc
diff --git a/omegalib/codegen/src/codegen.cc b/lib/codegen/src/codegen.cc
index 92ca702..92ca702 100755
--- a/omegalib/codegen/src/codegen.cc
+++ b/lib/codegen/src/codegen.cc
diff --git a/omegalib/omega/CMakeLists.txt b/lib/omega/CMakeLists.txt
index 5bc7e0b..a7b99c7 100644
--- a/omegalib/omega/CMakeLists.txt
+++ b/lib/omega/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(OMEGAROOT ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
 set(BASIC_SRC
     src/basic/ConstString.cc
     src/basic/Link.cc
diff --git a/omegalib/doc/interface.pdf b/lib/omega/doc/interface.pdf
index 7f918ae..7f918ae 100755..100644
--- a/omegalib/doc/interface.pdf
+++ b/lib/omega/doc/interface.pdf
diff --git a/omegalib/omega/include/basic/Bag.h b/lib/omega/include/basic/Bag.h
index a3d07a0..a3d07a0 100644
--- a/omegalib/omega/include/basic/Bag.h
+++ b/lib/omega/include/basic/Bag.h
diff --git a/omegalib/omega/include/basic/BoolSet.h b/lib/omega/include/basic/BoolSet.h
index a78af2e..a78af2e 100755
--- a/omegalib/omega/include/basic/BoolSet.h
+++ b/lib/omega/include/basic/BoolSet.h
diff --git a/omegalib/omega/include/basic/Collection.h b/lib/omega/include/basic/Collection.h
index 80ddf48..80ddf48 100644
--- a/omegalib/omega/include/basic/Collection.h
+++ b/lib/omega/include/basic/Collection.h
diff --git a/omegalib/omega/include/basic/Collections.h b/lib/omega/include/basic/Collections.h
index 1e68031..1e68031 100644
--- a/omegalib/omega/include/basic/Collections.h
+++ b/lib/omega/include/basic/Collections.h
diff --git a/omegalib/omega/include/basic/ConstString.h b/lib/omega/include/basic/ConstString.h
index f149c9d..f149c9d 100644
--- a/omegalib/omega/include/basic/ConstString.h
+++ b/lib/omega/include/basic/ConstString.h
diff --git a/omegalib/omega/include/basic/DynamicArray.h b/lib/omega/include/basic/DynamicArray.h
index 08f8b91..08f8b91 100644
--- a/omegalib/omega/include/basic/DynamicArray.h
+++ b/lib/omega/include/basic/DynamicArray.h
diff --git a/omegalib/omega/include/basic/Iterator.h b/lib/omega/include/basic/Iterator.h
index f62874c..f62874c 100644
--- a/omegalib/omega/include/basic/Iterator.h
+++ b/lib/omega/include/basic/Iterator.h
diff --git a/omegalib/omega/include/basic/Link.h b/lib/omega/include/basic/Link.h
index bdf169c..bdf169c 100644
--- a/omegalib/omega/include/basic/Link.h
+++ b/lib/omega/include/basic/Link.h
diff --git a/omegalib/omega/include/basic/List.h b/lib/omega/include/basic/List.h
index 28ab1d5..28ab1d5 100644
--- a/omegalib/omega/include/basic/List.h
+++ b/lib/omega/include/basic/List.h
diff --git a/omegalib/omega/include/basic/Map.h b/lib/omega/include/basic/Map.h
index 25a116d..25a116d 100644
--- a/omegalib/omega/include/basic/Map.h
+++ b/lib/omega/include/basic/Map.h
diff --git a/omegalib/omega/include/basic/Section.h b/lib/omega/include/basic/Section.h
index 7a4d241..7a4d241 100644
--- a/omegalib/omega/include/basic/Section.h
+++ b/lib/omega/include/basic/Section.h
diff --git a/omegalib/omega/include/basic/SimpleList.h b/lib/omega/include/basic/SimpleList.h
index 104390d..104390d 100644
--- a/omegalib/omega/include/basic/SimpleList.h
+++ b/lib/omega/include/basic/SimpleList.h
diff --git a/omegalib/omega/include/basic/Tuple.h b/lib/omega/include/basic/Tuple.h
index e9aae84..e9aae84 100644
--- a/omegalib/omega/include/basic/Tuple.h
+++ b/lib/omega/include/basic/Tuple.h
diff --git a/omegalib/omega/include/basic/omega_error.h b/lib/omega/include/basic/omega_error.h
index e342efb..e342efb 100644
--- a/omegalib/omega/include/basic/omega_error.h
+++ b/lib/omega/include/basic/omega_error.h
diff --git a/omegalib/omega/include/basic/util.h b/lib/omega/include/basic/util.h
index 4e807cd..4e807cd 100644
--- a/omegalib/omega/include/basic/util.h
+++ b/lib/omega/include/basic/util.h
diff --git a/omegalib/omega/include/omega.h b/lib/omega/include/omega.h
index 8aa2c08..8aa2c08 100644
--- a/omegalib/omega/include/omega.h
+++ b/lib/omega/include/omega.h
diff --git a/omegalib/omega/include/omega/RelBody.h b/lib/omega/include/omega/RelBody.h
index 3c11702..3c11702 100644
--- a/omegalib/omega/include/omega/RelBody.h
+++ b/lib/omega/include/omega/RelBody.h
diff --git a/omegalib/omega/include/omega/Rel_map.h b/lib/omega/include/omega/Rel_map.h
index 5641cb3..5641cb3 100644
--- a/omegalib/omega/include/omega/Rel_map.h
+++ b/lib/omega/include/omega/Rel_map.h
diff --git a/omegalib/omega/include/omega/Relation.h b/lib/omega/include/omega/Relation.h
index b41bef5..b41bef5 100644
--- a/omegalib/omega/include/omega/Relation.h
+++ b/lib/omega/include/omega/Relation.h
diff --git a/omegalib/omega/include/omega/Relations.h b/lib/omega/include/omega/Relations.h
index 4fd81e6..4fd81e6 100644
--- a/omegalib/omega/include/omega/Relations.h
+++ b/lib/omega/include/omega/Relations.h
diff --git a/omegalib/omega/include/omega/closure.h b/lib/omega/include/omega/closure.h
index 67088dd..67088dd 100644
--- a/omegalib/omega/include/omega/closure.h
+++ b/lib/omega/include/omega/closure.h
diff --git a/omegalib/omega/include/omega/evac.h b/lib/omega/include/omega/evac.h
index a561f8c..a561f8c 100644
--- a/omegalib/omega/include/omega/evac.h
+++ b/lib/omega/include/omega/evac.h
diff --git a/omegalib/omega/include/omega/farkas.h b/lib/omega/include/omega/farkas.h
index e77ed66..e77ed66 100644
--- a/omegalib/omega/include/omega/farkas.h
+++ b/lib/omega/include/omega/farkas.h
diff --git a/omegalib/omega/include/omega/hull.h b/lib/omega/include/omega/hull.h
index 928d0c6..928d0c6 100644
--- a/omegalib/omega/include/omega/hull.h
+++ b/lib/omega/include/omega/hull.h
diff --git a/omegalib/omega/include/omega/omega_core/debugging.h b/lib/omega/include/omega/omega_core/debugging.h
index e217ae9..e217ae9 100644
--- a/omegalib/omega/include/omega/omega_core/debugging.h
+++ b/lib/omega/include/omega/omega_core/debugging.h
diff --git a/omegalib/omega/include/omega/omega_core/oc.h b/lib/omega/include/omega/omega_core/oc.h
index e4f5444..e4f5444 100644
--- a/omegalib/omega/include/omega/omega_core/oc.h
+++ b/lib/omega/include/omega/omega_core/oc.h
diff --git a/omegalib/omega/include/omega/omega_core/oc_i.h b/lib/omega/include/omega/omega_core/oc_i.h
index 9533a40..9533a40 100644
--- a/omegalib/omega/include/omega/omega_core/oc_i.h
+++ b/lib/omega/include/omega/omega_core/oc_i.h
diff --git a/omegalib/omega/include/omega/omega_i.h b/lib/omega/include/omega/omega_i.h
index e5d9230..e5d9230 100644
--- a/omegalib/omega/include/omega/omega_i.h
+++ b/lib/omega/include/omega/omega_i.h
diff --git a/omegalib/omega/include/omega/pres_cmpr.h b/lib/omega/include/omega/pres_cmpr.h
index fb3e6f0..fb3e6f0 100644
--- a/omegalib/omega/include/omega/pres_cmpr.h
+++ b/lib/omega/include/omega/pres_cmpr.h
diff --git a/omegalib/omega/include/omega/pres_cnstr.h b/lib/omega/include/omega/pres_cnstr.h
index 7b2d98d..7b2d98d 100644
--- a/omegalib/omega/include/omega/pres_cnstr.h
+++ b/lib/omega/include/omega/pres_cnstr.h
diff --git a/omegalib/omega/include/omega/pres_conj.h b/lib/omega/include/omega/pres_conj.h
index ea10a2c..ea10a2c 100644
--- a/omegalib/omega/include/omega/pres_conj.h
+++ b/lib/omega/include/omega/pres_conj.h
diff --git a/omegalib/omega/include/omega/pres_decl.h b/lib/omega/include/omega/pres_decl.h
index 7fec0bc..7fec0bc 100644
--- a/omegalib/omega/include/omega/pres_decl.h
+++ b/lib/omega/include/omega/pres_decl.h
diff --git a/omegalib/omega/include/omega/pres_dnf.h b/lib/omega/include/omega/pres_dnf.h
index 93d5942..93d5942 100644
--- a/omegalib/omega/include/omega/pres_dnf.h
+++ b/lib/omega/include/omega/pres_dnf.h
diff --git a/omegalib/omega/include/omega/pres_form.h b/lib/omega/include/omega/pres_form.h
index ed3258e..ed3258e 100644
--- a/omegalib/omega/include/omega/pres_form.h
+++ b/lib/omega/include/omega/pres_form.h
diff --git a/omegalib/omega/include/omega/pres_gen.h b/lib/omega/include/omega/pres_gen.h
index ba6a793..ba6a793 100644
--- a/omegalib/omega/include/omega/pres_gen.h
+++ b/lib/omega/include/omega/pres_gen.h
diff --git a/omegalib/omega/include/omega/pres_logic.h b/lib/omega/include/omega/pres_logic.h
index 27c4553..27c4553 100644
--- a/omegalib/omega/include/omega/pres_logic.h
+++ b/lib/omega/include/omega/pres_logic.h
diff --git a/omegalib/omega/include/omega/pres_quant.h b/lib/omega/include/omega/pres_quant.h
index 98c30df..98c30df 100644
--- a/omegalib/omega/include/omega/pres_quant.h
+++ b/lib/omega/include/omega/pres_quant.h
diff --git a/omegalib/omega/include/omega/pres_subs.h b/lib/omega/include/omega/pres_subs.h
index 8a9ee92..8a9ee92 100644
--- a/omegalib/omega/include/omega/pres_subs.h
+++ b/lib/omega/include/omega/pres_subs.h
diff --git a/omegalib/omega/include/omega/pres_tree.h b/lib/omega/include/omega/pres_tree.h
index ad78ad0..ad78ad0 100644
--- a/omegalib/omega/include/omega/pres_tree.h
+++ b/lib/omega/include/omega/pres_tree.h
diff --git a/omegalib/omega/include/omega/pres_var.h b/lib/omega/include/omega/pres_var.h
index bf60dcb..bf60dcb 100644
--- a/omegalib/omega/include/omega/pres_var.h
+++ b/lib/omega/include/omega/pres_var.h
diff --git a/omegalib/omega/include/omega/reach.h b/lib/omega/include/omega/reach.h
index 76d7dee..76d7dee 100644
--- a/omegalib/omega/include/omega/reach.h
+++ b/lib/omega/include/omega/reach.h
diff --git a/omegalib/omega/src/RelBody.cc b/lib/omega/src/RelBody.cc
index 825b153..825b153 100644
--- a/omegalib/omega/src/RelBody.cc
+++ b/lib/omega/src/RelBody.cc
diff --git a/omegalib/omega/src/RelVar.cc b/lib/omega/src/RelVar.cc
index d9b977c..d9b977c 100644
--- a/omegalib/omega/src/RelVar.cc
+++ b/lib/omega/src/RelVar.cc
diff --git a/omegalib/omega/src/Relation.cc b/lib/omega/src/Relation.cc
index 1cca43a..1cca43a 100644
--- a/omegalib/omega/src/Relation.cc
+++ b/lib/omega/src/Relation.cc
diff --git a/omegalib/omega/src/Relations.cc b/lib/omega/src/Relations.cc
index d7dbe86..d7dbe86 100644
--- a/omegalib/omega/src/Relations.cc
+++ b/lib/omega/src/Relations.cc
diff --git a/omegalib/omega/src/basic/ConstString.cc b/lib/omega/src/basic/ConstString.cc
index 7d2ec1e..7d2ec1e 100644
--- a/omegalib/omega/src/basic/ConstString.cc
+++ b/lib/omega/src/basic/ConstString.cc
diff --git a/omegalib/omega/src/basic/Link.cc b/lib/omega/src/basic/Link.cc
index 50b9441..50b9441 100644
--- a/omegalib/omega/src/basic/Link.cc
+++ b/lib/omega/src/basic/Link.cc
diff --git a/omegalib/omega/src/closure.cc b/lib/omega/src/closure.cc
index 416a3e7..416a3e7 100644
--- a/omegalib/omega/src/closure.cc
+++ b/lib/omega/src/closure.cc
diff --git a/omegalib/omega/src/evac.cc b/lib/omega/src/evac.cc
index ff872c9..ff872c9 100644
--- a/omegalib/omega/src/evac.cc
+++ b/lib/omega/src/evac.cc
diff --git a/omegalib/omega/src/farkas.cc b/lib/omega/src/farkas.cc
index 1b3ef87..1b3ef87 100644
--- a/omegalib/omega/src/farkas.cc
+++ b/lib/omega/src/farkas.cc
diff --git a/omegalib/omega/src/hull_legacy.cc b/lib/omega/src/hull_legacy.cc
index a59d34f..a59d34f 100755
--- a/omegalib/omega/src/hull_legacy.cc
+++ b/lib/omega/src/hull_legacy.cc
diff --git a/omegalib/omega/src/hull_simple.cc b/lib/omega/src/hull_simple.cc
index 62dcb26..62dcb26 100755
--- a/omegalib/omega/src/hull_simple.cc
+++ b/lib/omega/src/hull_simple.cc
diff --git a/omegalib/omega/src/omega_core/oc.cc b/lib/omega/src/omega_core/oc.cc
index 0dc9b49..0dc9b49 100644
--- a/omegalib/omega/src/omega_core/oc.cc
+++ b/lib/omega/src/omega_core/oc.cc
diff --git a/omegalib/omega/src/omega_core/oc_eq.cc b/lib/omega/src/omega_core/oc_eq.cc
index dc595ea..dc595ea 100644
--- a/omegalib/omega/src/omega_core/oc_eq.cc
+++ b/lib/omega/src/omega_core/oc_eq.cc
diff --git a/omegalib/omega/src/omega_core/oc_exp_kill.cc b/lib/omega/src/omega_core/oc_exp_kill.cc
index fdb2718..fdb2718 100644
--- a/omegalib/omega/src/omega_core/oc_exp_kill.cc
+++ b/lib/omega/src/omega_core/oc_exp_kill.cc
diff --git a/omegalib/omega/src/omega_core/oc_global.cc b/lib/omega/src/omega_core/oc_global.cc
index 17d8a0c..17d8a0c 100644
--- a/omegalib/omega/src/omega_core/oc_global.cc
+++ b/lib/omega/src/omega_core/oc_global.cc
diff --git a/omegalib/omega/src/omega_core/oc_print.cc b/lib/omega/src/omega_core/oc_print.cc
index 7934713..7934713 100644
--- a/omegalib/omega/src/omega_core/oc_print.cc
+++ b/lib/omega/src/omega_core/oc_print.cc
diff --git a/omegalib/omega/src/omega_core/oc_problems.cc b/lib/omega/src/omega_core/oc_problems.cc
index 8b6e04c..8b6e04c 100644
--- a/omegalib/omega/src/omega_core/oc_problems.cc
+++ b/lib/omega/src/omega_core/oc_problems.cc
diff --git a/omegalib/omega/src/omega_core/oc_query.cc b/lib/omega/src/omega_core/oc_query.cc
index 528b297..528b297 100644
--- a/omegalib/omega/src/omega_core/oc_query.cc
+++ b/lib/omega/src/omega_core/oc_query.cc
diff --git a/omegalib/omega/src/omega_core/oc_quick_kill.cc b/lib/omega/src/omega_core/oc_quick_kill.cc
index 1b988d4..1b988d4 100644
--- a/omegalib/omega/src/omega_core/oc_quick_kill.cc
+++ b/lib/omega/src/omega_core/oc_quick_kill.cc
diff --git a/omegalib/omega/src/omega_core/oc_simple.cc b/lib/omega/src/omega_core/oc_simple.cc
index 0e492db..0e492db 100644
--- a/omegalib/omega/src/omega_core/oc_simple.cc
+++ b/lib/omega/src/omega_core/oc_simple.cc
diff --git a/omegalib/omega/src/omega_core/oc_solve.cc b/lib/omega/src/omega_core/oc_solve.cc
index c25b6d0..c25b6d0 100644
--- a/omegalib/omega/src/omega_core/oc_solve.cc
+++ b/lib/omega/src/omega_core/oc_solve.cc
diff --git a/omegalib/omega/src/omega_core/oc_util.cc b/lib/omega/src/omega_core/oc_util.cc
index a7d21be..a7d21be 100644
--- a/omegalib/omega/src/omega_core/oc_util.cc
+++ b/lib/omega/src/omega_core/oc_util.cc
diff --git a/omegalib/omega/src/pres_beaut.cc b/lib/omega/src/pres_beaut.cc
index c23962a..c23962a 100644
--- a/omegalib/omega/src/pres_beaut.cc
+++ b/lib/omega/src/pres_beaut.cc
diff --git a/omegalib/omega/src/pres_cnstr.cc b/lib/omega/src/pres_cnstr.cc
index a8ebd15..a8ebd15 100644
--- a/omegalib/omega/src/pres_cnstr.cc
+++ b/lib/omega/src/pres_cnstr.cc
diff --git a/omegalib/omega/src/pres_col.cc b/lib/omega/src/pres_col.cc
index 1569116..1569116 100644
--- a/omegalib/omega/src/pres_col.cc
+++ b/lib/omega/src/pres_col.cc
diff --git a/omegalib/omega/src/pres_conj.cc b/lib/omega/src/pres_conj.cc
index f3f458d..f3f458d 100644
--- a/omegalib/omega/src/pres_conj.cc
+++ b/lib/omega/src/pres_conj.cc
diff --git a/omegalib/omega/src/pres_decl.cc b/lib/omega/src/pres_decl.cc
index f5ac312..f5ac312 100644
--- a/omegalib/omega/src/pres_decl.cc
+++ b/lib/omega/src/pres_decl.cc
diff --git a/omegalib/omega/src/pres_dnf.cc b/lib/omega/src/pres_dnf.cc
index c9fd7e6..c9fd7e6 100644
--- a/omegalib/omega/src/pres_dnf.cc
+++ b/lib/omega/src/pres_dnf.cc
diff --git a/omegalib/omega/src/pres_form.cc b/lib/omega/src/pres_form.cc
index 82b710b..82b710b 100644
--- a/omegalib/omega/src/pres_form.cc
+++ b/lib/omega/src/pres_form.cc
diff --git a/omegalib/omega/src/pres_gen.cc b/lib/omega/src/pres_gen.cc
index 0f05d40..0f05d40 100644
--- a/omegalib/omega/src/pres_gen.cc
+++ b/lib/omega/src/pres_gen.cc
diff --git a/omegalib/omega/src/pres_logic.cc b/lib/omega/src/pres_logic.cc
index 8ee90f1..8ee90f1 100644
--- a/omegalib/omega/src/pres_logic.cc
+++ b/lib/omega/src/pres_logic.cc
diff --git a/omegalib/omega/src/pres_print.cc b/lib/omega/src/pres_print.cc
index 4f2cd0d..4f2cd0d 100644
--- a/omegalib/omega/src/pres_print.cc
+++ b/lib/omega/src/pres_print.cc
diff --git a/omegalib/omega/src/pres_quant.cc b/lib/omega/src/pres_quant.cc
index 5483bad..5483bad 100644
--- a/omegalib/omega/src/pres_quant.cc
+++ b/lib/omega/src/pres_quant.cc
diff --git a/omegalib/omega/src/pres_rear.cc b/lib/omega/src/pres_rear.cc
index 508959d..508959d 100644
--- a/omegalib/omega/src/pres_rear.cc
+++ b/lib/omega/src/pres_rear.cc
diff --git a/omegalib/omega/src/pres_subs.cc b/lib/omega/src/pres_subs.cc
index 9854b09..9854b09 100644
--- a/omegalib/omega/src/pres_subs.cc
+++ b/lib/omega/src/pres_subs.cc
diff --git a/omegalib/omega/src/pres_var.cc b/lib/omega/src/pres_var.cc
index 0ec406f..0ec406f 100644
--- a/omegalib/omega/src/pres_var.cc
+++ b/lib/omega/src/pres_var.cc
diff --git a/omegalib/omega/src/reach.cc b/lib/omega/src/reach.cc
index 6569edb..6569edb 100644
--- a/omegalib/omega/src/reach.cc
+++ b/lib/omega/src/reach.cc
diff --git a/lib/rosecg/CMakeLists.txt b/lib/rosecg/CMakeLists.txt
new file mode 100644
index 0000000..610bc50
--- /dev/null
+++ b/lib/rosecg/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(CODEGEN_ROSE_SRC
+    src/CG_roseBuilder.cc
+    src/CG_roseRepr.cc
+    src/rose_attributes.cc
+    )
+
+include_directories(
+    include
+    ${OMEGA_INC}
+    ${ROSEHOME}/include
+    ${ROSEHOME}/include/rose
+    ${BOOSTHOME}/include
+    )
+
+add_library(rosecg ${CODEGEN_ROSE_SRC})
+
+install(TARGETS rosecg
+        DESTINATION lib)
diff --git a/omegalib/codegen/include/code_gen/CG_roseBuilder.h b/lib/rosecg/include/CG_roseBuilder.h
index 5dad663..bb622c7 100644
--- a/omegalib/codegen/include/code_gen/CG_roseBuilder.h
+++ b/lib/rosecg/include/CG_roseBuilder.h
@@ -2,9 +2,9 @@
 #define CG_roseBuilder_h
 
 #include <basic/Tuple.h>
-#include <code_gen/rose_attributes.h>
+#include "rose_attributes.h"
 #include <code_gen/CG_outputBuilder.h>
-#include <code_gen/CG_roseRepr.h>
+#include "CG_roseRepr.h"
 #include <string>
 
 namespace omega {
diff --git a/omegalib/codegen/include/code_gen/CG_roseRepr.h b/lib/rosecg/include/CG_roseRepr.h
index 28553e7..28553e7 100644
--- a/omegalib/codegen/include/code_gen/CG_roseRepr.h
+++ b/lib/rosecg/include/CG_roseRepr.h
diff --git a/omegalib/codegen/include/code_gen/rose_attributes.h b/lib/rosecg/include/rose_attributes.h
index 9766f52..9766f52 100644
--- a/omegalib/codegen/include/code_gen/rose_attributes.h
+++ b/lib/rosecg/include/rose_attributes.h
diff --git a/omegalib/codegen/src/CG_roseBuilder.cc b/lib/rosecg/src/CG_roseBuilder.cc
index 7e12634..09370a4 100644
--- a/omegalib/codegen/src/CG_roseBuilder.cc
+++ b/lib/rosecg/src/CG_roseBuilder.cc
@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 #include <stack>
-#include <code_gen/CG_roseBuilder.h>
+#include "CG_roseBuilder.h"
 #include <string>
 
 struct ir_error: public std::runtime_error {
diff --git a/omegalib/codegen/src/CG_roseRepr.cc b/lib/rosecg/src/CG_roseRepr.cc
index 9265ab0..0b0c073 100644
--- a/omegalib/codegen/src/CG_roseRepr.cc
+++ b/lib/rosecg/src/CG_roseRepr.cc
@@ -11,8 +11,8 @@
    02/01/06 - Chun Chen - created
 *****************************************************************************/
 
-#include <code_gen/CG_roseRepr.h>
-#include <code_gen/rose_attributes.h>
+#include "CG_roseRepr.h"
+#include "rose_attributes.h"
 #include <stdio.h>
 #include <string.h>
 #include <cstring>
diff --git a/omegalib/codegen/src/rose_attributes.cc b/lib/rosecg/src/rose_attributes.cc
index bb9681c..3debb2d 100644
--- a/omegalib/codegen/src/rose_attributes.cc
+++ b/lib/rosecg/src/rose_attributes.cc
@@ -1,4 +1,4 @@
-#include <code_gen/rose_attributes.h>
+#include "rose_attributes.h"
 
 namespace omega {
 
diff --git a/omegalib/CMakeLists.txt b/omegalib/CMakeLists.txt
deleted file mode 100644
index 501d67a..0000000
--- a/omegalib/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(omegalib)
-
-if(NOT DEFINED ROSEHOME)
-    message( FATAL_ERROR "ROSEHOME is not set, try use -DROSEHOME" )
-endif()
-if (NOT DEFINED BOOSTHOME)
-    message( FATAL_ERROR "BOOSTHOME is not set, try use -DBOOSTHOME" )
-endif()
-
-set(OMEGAROOT ${PROJECT_SOURCE_DIR})
-
-add_subdirectory(omega)
-add_subdirectory(codegen)
diff --git a/omegalib/doc/calculator.pdf b/omegalib/doc/calculator.pdf
deleted file mode 100755
index 5c307ab..0000000
--- a/omegalib/doc/calculator.pdf
+++ /dev/null
diff --git a/omegalib/omega/doc/interface.pdf b/omegalib/omega/doc/interface.pdf
deleted file mode 100644
index 7f918ae..0000000
--- a/omegalib/omega/doc/interface.pdf
+++ /dev/null
diff --git a/chill/src/chill_run.cc b/src/chill_run.cc
index 4eafe65..4eafe65 100644
--- a/chill/src/chill_run.cc
+++ b/src/chill_run.cc
diff --git a/chill/src/chill_run_util.cc b/src/chill_run_util.cc
index 29568e7..29568e7 100644
--- a/chill/src/chill_run_util.cc
+++ b/src/chill_run_util.cc
diff --git a/chill/src/chillmodule.cc b/src/chillmodule.cc
index 0e41f88..0e41f88 100644
--- a/chill/src/chillmodule.cc
+++ b/src/chillmodule.cc
diff --git a/chill/src/dep.cc b/src/dep.cc
index a675d03..a675d03 100644
--- a/chill/src/dep.cc
+++ b/src/dep.cc
diff --git a/chill/src/ir_rose.cc b/src/ir_rose.cc
index 27930e6..dc3eed8 100644
--- a/chill/src/ir_rose.cc
+++ b/src/ir_rose.cc
@@ -14,9 +14,9 @@
 #include <string>
 #include "ir_rose.hh"
 #include "ir_rose_utils.hh"
-#include <code_gen/rose_attributes.h>
-#include <code_gen/CG_roseRepr.h>
-#include <code_gen/CG_roseBuilder.h>
+#include "rose_attributes.h"
+#include "CG_roseRepr.h"
+#include "CG_roseBuilder.h"
 
 using namespace SageBuilder;
 using namespace SageInterface;
diff --git a/chill/src/ir_rose_utils.cc b/src/ir_rose_utils.cc
index 64b0891..64b0891 100644
--- a/chill/src/ir_rose_utils.cc
+++ b/src/ir_rose_utils.cc
diff --git a/chill/src/irtools.cc b/src/irtools.cc
index 4ab6c85..4ab6c85 100644
--- a/chill/src/irtools.cc
+++ b/src/irtools.cc
diff --git a/chill/src/loop.cc b/src/loop.cc
index f187a50..f187a50 100644
--- a/chill/src/loop.cc
+++ b/src/loop.cc
diff --git a/chill/src/loop_basic.cc b/src/loop_basic.cc
index f5234b9..f5234b9 100644
--- a/chill/src/loop_basic.cc
+++ b/src/loop_basic.cc
diff --git a/chill/src/loop_datacopy.cc b/src/loop_datacopy.cc
index 8d11b0a..8d11b0a 100644
--- a/chill/src/loop_datacopy.cc
+++ b/src/loop_datacopy.cc
diff --git a/chill/src/loop_extra.cc b/src/loop_extra.cc
index dac05bf..dac05bf 100644
--- a/chill/src/loop_extra.cc
+++ b/src/loop_extra.cc
diff --git a/chill/src/loop_tile.cc b/src/loop_tile.cc
index aae8dd8..aae8dd8 100644
--- a/chill/src/loop_tile.cc
+++ b/src/loop_tile.cc
diff --git a/chill/src/loop_unroll.cc b/src/loop_unroll.cc
index 9bc6acf..9bc6acf 100644
--- a/chill/src/loop_unroll.cc
+++ b/src/loop_unroll.cc
diff --git a/chill/src/omegatools.cc b/src/omegatools.cc
index 3aac404..3aac404 100644
--- a/chill/src/omegatools.cc
+++ b/src/omegatools.cc
diff --git a/chill/src/parse_expr.ll b/src/parse_expr.ll
index a9b389f..a9b389f 100644
--- a/chill/src/parse_expr.ll
+++ b/src/parse_expr.ll
diff --git a/chill/src/parse_expr.yy b/src/parse_expr.yy
index c2943c2..c2943c2 100644
--- a/chill/src/parse_expr.yy
+++ b/src/parse_expr.yy