diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | colm/.gitignore | 38 | ||||
| -rw-r--r-- | colm/CMakeLists.txt | 187 | ||||
| -rw-r--r-- | colm/config.h.cmake.in | 14 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/.gitignore | 37 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 188 | ||||
| -rw-r--r-- | src/ChangeLog (renamed from colm/ChangeLog) | 0 | ||||
| -rw-r--r-- | src/Makefile.am (renamed from colm/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/buffer.h (renamed from colm/buffer.h) | 0 | ||||
| -rw-r--r-- | src/bytecode.c (renamed from colm/bytecode.c) | 0 | ||||
| -rw-r--r-- | src/bytecode.h (renamed from colm/bytecode.h) | 0 | ||||
| -rw-r--r-- | src/closure.cc (renamed from colm/closure.cc) | 0 | ||||
| -rw-r--r-- | src/codegen.cc (renamed from colm/codegen.cc) | 0 | ||||
| -rw-r--r-- | src/codevect.c (renamed from colm/codevect.c) | 0 | ||||
| -rw-r--r-- | src/colm-config.cmake.in (renamed from colm/colm-config.cmake.in) | 0 | ||||
| -rw-r--r-- | src/colm-wrap.sh (renamed from colm/colm-wrap.sh) | 0 | ||||
| -rw-r--r-- | src/colm.h (renamed from colm/colm.h) | 0 | ||||
| -rw-r--r-- | src/colm.lm (renamed from colm/colm.lm) | 0 | ||||
| -rw-r--r-- | src/colmex.h (renamed from colm/colmex.h) | 0 | ||||
| -rw-r--r-- | src/commit.c (renamed from colm/commit.c) | 0 | ||||
| -rw-r--r-- | src/compiler.cc (renamed from colm/compiler.cc) | 0 | ||||
| -rw-r--r-- | src/compiler.h (renamed from colm/compiler.h) | 0 | ||||
| -rw-r--r-- | src/config.h.cmake.in | 1 | ||||
| -rw-r--r-- | src/consinit.cc (renamed from colm/consinit.cc) | 0 | ||||
| -rw-r--r-- | src/consinit.h (renamed from colm/consinit.h) | 0 | ||||
| -rw-r--r-- | src/cstring.h (renamed from colm/cstring.h) | 0 | ||||
| -rw-r--r-- | src/ctinput.cc (renamed from colm/ctinput.cc) | 0 | ||||
| -rw-r--r-- | src/debug.c (renamed from colm/debug.c) | 0 | ||||
| -rw-r--r-- | src/debug.h (renamed from colm/debug.h) | 0 | ||||
| -rw-r--r-- | src/declare.cc (renamed from colm/declare.cc) | 0 | ||||
| -rw-r--r-- | src/defs.h.cmake.in (renamed from colm/defs.h.cmake.in) | 0 | ||||
| -rw-r--r-- | src/defs.h.in (renamed from colm/defs.h.in) | 0 | ||||
| -rw-r--r-- | src/dotgen.cc (renamed from colm/dotgen.cc) | 0 | ||||
| -rw-r--r-- | src/dotgen.h (renamed from colm/dotgen.h) | 0 | ||||
| -rw-r--r-- | src/exports.cc (renamed from colm/exports.cc) | 0 | ||||
| -rw-r--r-- | src/fsmap.cc (renamed from colm/fsmap.cc) | 0 | ||||
| -rw-r--r-- | src/fsmattach.cc (renamed from colm/fsmattach.cc) | 0 | ||||
| -rw-r--r-- | src/fsmbase.cc (renamed from colm/fsmbase.cc) | 0 | ||||
| -rw-r--r-- | src/fsmcodegen.cc (renamed from colm/fsmcodegen.cc) | 0 | ||||
| -rw-r--r-- | src/fsmcodegen.h (renamed from colm/fsmcodegen.h) | 0 | ||||
| -rw-r--r-- | src/fsmexec.cc (renamed from colm/fsmexec.cc) | 0 | ||||
| -rw-r--r-- | src/fsmgraph.cc (renamed from colm/fsmgraph.cc) | 0 | ||||
| -rw-r--r-- | src/fsmgraph.h (renamed from colm/fsmgraph.h) | 0 | ||||
| -rw-r--r-- | src/fsmmin.cc (renamed from colm/fsmmin.cc) | 0 | ||||
| -rw-r--r-- | src/fsmstate.cc (renamed from colm/fsmstate.cc) | 0 | ||||
| -rw-r--r-- | src/global.h (renamed from colm/global.h) | 0 | ||||
| -rw-r--r-- | src/input.c (renamed from colm/input.c) | 0 | ||||
| -rw-r--r-- | src/input.h (renamed from colm/input.h) | 0 | ||||
| -rw-r--r-- | src/internal.h (renamed from colm/internal.h) | 0 | ||||
| -rw-r--r-- | src/iter.c (renamed from colm/iter.c) | 0 | ||||
| -rw-r--r-- | src/keyops.h (renamed from colm/keyops.h) | 0 | ||||
| -rw-r--r-- | src/list.c (renamed from colm/list.c) | 0 | ||||
| -rw-r--r-- | src/lmparse.kh (renamed from colm/lmparse.kh) | 0 | ||||
| -rw-r--r-- | src/lmparse.kl (renamed from colm/lmparse.kl) | 0 | ||||
| -rw-r--r-- | src/lmscan.h (renamed from colm/lmscan.h) | 0 | ||||
| -rw-r--r-- | src/lmscan.rl (renamed from colm/lmscan.rl) | 0 | ||||
| -rw-r--r-- | src/loadboot2.cc (renamed from colm/loadboot2.cc) | 0 | ||||
| -rw-r--r-- | src/loadcolm.cc (renamed from colm/loadcolm.cc) | 0 | ||||
| -rw-r--r-- | src/loadfinal.cc (renamed from colm/loadfinal.cc) | 0 | ||||
| -rw-r--r-- | src/loadfinal.h (renamed from colm/loadfinal.h) | 0 | ||||
| -rw-r--r-- | src/loadinit.cc (renamed from colm/loadinit.cc) | 0 | ||||
| -rw-r--r-- | src/loadinit.h (renamed from colm/loadinit.h) | 0 | ||||
| -rw-r--r-- | src/lookup.cc (renamed from colm/lookup.cc) | 0 | ||||
| -rw-r--r-- | src/main.cc (renamed from colm/main.cc) | 0 | ||||
| -rw-r--r-- | src/map.c (renamed from colm/map.c) | 0 | ||||
| -rw-r--r-- | src/map.cc (renamed from colm/map.cc) | 0 | ||||
| -rw-r--r-- | src/map.h (renamed from colm/map.h) | 0 | ||||
| -rw-r--r-- | src/parser.cc (renamed from colm/parser.cc) | 0 | ||||
| -rw-r--r-- | src/parser.h (renamed from colm/parser.h) | 0 | ||||
| -rw-r--r-- | src/parsetree.cc (renamed from colm/parsetree.cc) | 0 | ||||
| -rw-r--r-- | src/parsetree.h (renamed from colm/parsetree.h) | 0 | ||||
| -rw-r--r-- | src/pcheck.cc (renamed from colm/pcheck.cc) | 0 | ||||
| -rw-r--r-- | src/pcheck.h (renamed from colm/pcheck.h) | 0 | ||||
| -rw-r--r-- | src/pdabuild.cc (renamed from colm/pdabuild.cc) | 0 | ||||
| -rw-r--r-- | src/pdacodegen.cc (renamed from colm/pdacodegen.cc) | 0 | ||||
| -rw-r--r-- | src/pdacodegen.h (renamed from colm/pdacodegen.h) | 0 | ||||
| -rw-r--r-- | src/pdagraph.cc (renamed from colm/pdagraph.cc) | 0 | ||||
| -rw-r--r-- | src/pdagraph.h (renamed from colm/pdagraph.h) | 0 | ||||
| -rw-r--r-- | src/pdarun.c (renamed from colm/pdarun.c) | 0 | ||||
| -rw-r--r-- | src/pdarun.h (renamed from colm/pdarun.h) | 0 | ||||
| -rw-r--r-- | src/pool.c (renamed from colm/pool.c) | 0 | ||||
| -rw-r--r-- | src/pool.h (renamed from colm/pool.h) | 0 | ||||
| -rw-r--r-- | src/print.c (renamed from colm/print.c) | 0 | ||||
| -rw-r--r-- | src/prog.lm (renamed from colm/prog.lm) | 0 | ||||
| -rw-r--r-- | src/program.c (renamed from colm/program.c) | 0 | ||||
| -rw-r--r-- | src/program.h (renamed from colm/program.h) | 0 | ||||
| -rw-r--r-- | src/redbuild.cc (renamed from colm/redbuild.cc) | 0 | ||||
| -rw-r--r-- | src/redbuild.h (renamed from colm/redbuild.h) | 0 | ||||
| -rw-r--r-- | src/redfsm.cc (renamed from colm/redfsm.cc) | 0 | ||||
| -rw-r--r-- | src/redfsm.h (renamed from colm/redfsm.h) | 0 | ||||
| -rw-r--r-- | src/reduce.cc (renamed from colm/reduce.cc) | 0 | ||||
| -rw-r--r-- | src/resolve.cc (renamed from colm/resolve.cc) | 0 | ||||
| -rw-r--r-- | src/rtvector.h (renamed from colm/rtvector.h) | 0 | ||||
| -rw-r--r-- | src/stream.c (renamed from colm/stream.c) | 0 | ||||
| -rw-r--r-- | src/string.c (renamed from colm/string.c) | 0 | ||||
| -rw-r--r-- | src/struct.c (renamed from colm/struct.c) | 0 | ||||
| -rw-r--r-- | src/struct.h (renamed from colm/struct.h) | 0 | ||||
| -rw-r--r-- | src/synthesis.cc (renamed from colm/synthesis.cc) | 0 | ||||
| -rw-r--r-- | src/tree.c (renamed from colm/tree.c) | 0 | ||||
| -rw-r--r-- | src/tree.h (renamed from colm/tree.h) | 0 | ||||
| -rw-r--r-- | src/type.h (renamed from colm/type.h) | 0 | ||||
| -rw-r--r-- | src/version.h.cmake.in (renamed from colm/version.h.cmake.in) | 0 | ||||
| -rw-r--r-- | test/rlhc.d/Makefile.am | 2 | ||||
| -rw-r--r-- | test/rlparse.d/Makefile.am | 6 | ||||
| -rw-r--r-- | test/trans.d/Makefile.am | 6 |
106 files changed, 233 insertions, 258 deletions
diff --git a/Makefile.am b/Makefile.am index a6cd9ed2..c57c4071 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -SUBDIRS = aapl libfsm colm doc test +SUBDIRS = aapl libfsm src cgil doc test dist_doc_DATA = colm.vim EXTRA_DIST = colm.vim sedsubst diff --git a/colm/.gitignore b/colm/.gitignore deleted file mode 100644 index 4538dcbd..00000000 --- a/colm/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -/*.o -/*.lo -/Makefile.in -/Makefile -/.*.d -/colm -/defs.h -/config.h -/version.h -/tags -/.deps -/libcolm.a -/libcolm.la -/.libs -/stamp-h1 -/stamp-h2 - -/bootstrap[012] -/gen -/tar -/include - -/libprog.a - -/CMakeFiles -/cmake_install.cmake -/*.exe - -# Common testing files. -/tmp.lm -/tmp.c -/tmp -/input[0-9] -/input -/output -/log - -/colm-wrap diff --git a/colm/CMakeLists.txt b/colm/CMakeLists.txt deleted file mode 100644 index 3d855523..00000000 --- a/colm/CMakeLists.txt +++ /dev/null @@ -1,187 +0,0 @@ -# Package name -set(_PACKAGE_NAME colm) - -# Read project configuration from ../configure.ac file -file(STRINGS ../configure.ac _PROJECT_CONFIGS - REGEX "(COLM_VERSION=)|(COLM_PUBDATE=)") -foreach(_PROJECT_CONFIG ${_PROJECT_CONFIGS}) - if(_PROJECT_CONFIG MATCHES "COLM_VERSION=\"([^\"]+)") - string(STRIP ${CMAKE_MATCH_1} COLM_VERSION) - endif() - if(_PROJECT_CONFIG MATCHES "COLM_PUBDATE=\"([^\"]+)") - string(STRIP ${CMAKE_MATCH_1} COLM_PUBDATE) - endif() -endforeach() - -# Generate headers -configure_file(version.h.cmake.in version.h @ONLY) -configure_file(defs.h.cmake.in defs.h @ONLY) -configure_file(colm-config.cmake.in -"${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" @ONLY) - -# Runtime headers -set(RUNTIME_HDR - bytecode.h debug.h pool.h input.h - pdarun.h map.h type.h tree.h struct.h program.h colm.h internal.h) - -foreach(_hdr defs.h) - list(APPEND RUNTIME_HDR "${CMAKE_CURRENT_BINARY_DIR}/${_hdr}") -endforeach() - -# Other CMake modules -include(GNUInstallDirs) - -# libcolm - -add_library(libcolm - map.c pdarun.c list.c input.c stream.c debug.c - codevect.c pool.c string.c tree.c iter.c - bytecode.c program.c struct.c commit.c - print.c) - -target_include_directories(libcolm - PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../src> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - -set_target_properties(libcolm PROPERTIES - OUTPUT_NAME colm) - -# libprog - -add_library(libprog - buffer.h bytecode.h colm.h debug.h dotgen.h fsmcodegen.h fsmgraph.h - input.h keyops.h map.h compiler.h - parsetree.h pcheck.h pdacodegen.h pdagraph.h pdarun.h pool.h redbuild.h - redfsm.h rtvector.h tree.h global.h colm.h parser.h cstring.h - internal.h - resolve.cc lookup.cc synthesis.cc parsetree.cc - fsmstate.cc fsmbase.cc fsmattach.cc fsmmin.cc - fsmgraph.cc pdagraph.cc pdabuild.cc pdacodegen.cc fsmcodegen.cc - redfsm.cc fsmexec.cc redbuild.cc closure.cc fsmap.cc - dotgen.cc pcheck.cc ctinput.cc declare.cc codegen.cc - exports.cc compiler.cc parser.cc reduce.cc) - -target_include_directories(libprog - PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../aapl> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>) - -set_target_properties(libprog PROPERTIES - OUTPUT_NAME prog) - -# bootstrap0 - -add_executable(bootstrap0 - consinit.cc consinit.h main.cc) - -target_link_libraries(bootstrap0 libprog libcolm) - -set_property(TARGET bootstrap0 APPEND PROPERTY - COMPILE_DEFINITIONS CONS_INIT ${common_COMPILE_DEFINITIONS}) - -set_property(TARGET bootstrap0 APPEND PROPERTY - COMPILE_FLAGS -fpermissive) - -# bootstrap1 - -make_directory("${CMAKE_CURRENT_BINARY_DIR}/gen") - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse1.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.h" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.cc" - COMMAND bootstrap0 - ARGS -c -o parse1.c -e if1.h -x if1.cc - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") - -add_executable(bootstrap1 - loadinit.h loadinit.cc main.cc - "${CMAKE_CURRENT_BINARY_DIR}/gen/parse1.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.cc") - -target_link_libraries(bootstrap1 libprog libcolm) - -set_property(TARGET bootstrap1 APPEND PROPERTY - COMPILE_DEFINITIONS LOAD_INIT ${common_COMPILE_DEFINITIONS}) - -# bootstrap2 - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse2.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.h" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.cc" - COMMAND bootstrap1 - ARGS -c -o parse2.c -e if2.h -x if2.cc "${CMAKE_CURRENT_LIST_DIR}/colm.lm" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") - -add_executable(bootstrap2 - main.cc loadboot2.cc loadfinal.h version.h - "${CMAKE_CURRENT_BINARY_DIR}/gen/parse2.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.cc") - -target_link_libraries(bootstrap2 libprog libcolm) - -set_property(TARGET bootstrap2 APPEND PROPERTY - COMPILE_DEFINITIONS LOAD_COLM ${common_COMPILE_DEFINITIONS}) - -# colm - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse3.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.h" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.cc" - COMMAND bootstrap2 - ARGS -I "${CMAKE_CURRENT_LIST_DIR}" -c -o parse3.c -e if3.h -x if3.cc "${CMAKE_CURRENT_LIST_DIR}/prog.lm" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") - -add_executable(colm - main.cc loadcolm.cc loadfinal.h version.h - "${CMAKE_CURRENT_BINARY_DIR}/gen/parse3.c" - "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.cc") - -if(BUILD_STANDALONE) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - target_link_libraries(colm -static) - else() - message(FATAL_ERROR "Unsupported toolset for standalone build.") - endif() -endif() - -target_link_libraries(colm libprog libcolm) - -set_property(TARGET colm APPEND PROPERTY - COMPILE_DEFINITIONS LOAD_COLM ${common_COMPILE_DEFINITIONS}) - -if(${PROJECT_NAME}_MAKE_INSTALL) - if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) - set(CMAKE_INSTALL_CMAKEDIR - "${CMAKE_INSTALL_LIBDIR}/cmake/${_PACKAGE_NAME}" - CACHE STRING "CMake packages") - endif() - install(FILES ${RUNTIME_HDR} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/colm") - install(TARGETS libcolm colm - EXPORT ${_PACKAGE_NAME}-targets - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(EXPORT ${_PACKAGE_NAME}-targets - NAMESPACE ${_PACKAGE_NAME}:: - DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") - export(EXPORT ${_PACKAGE_NAME}-targets - NAMESPACE ${_PACKAGE_NAME}:: - FILE "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-targets.cmake") - include(CMakePackageConfigHelpers) - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" - VERSION ${COLM_VERSION} - COMPATIBILITY AnyNewerVersion) - install(FILES - "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" - "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" - DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") -endif() diff --git a/colm/config.h.cmake.in b/colm/config.h.cmake.in deleted file mode 100644 index 455cffe7..00000000 --- a/colm/config.h.cmake.in +++ /dev/null @@ -1,14 +0,0 @@ -/* config.h Generated from config.h.cmake.in by cmake */ - -#ifndef _COLM_CONFIG_H -#define _COLM_CONFIG_H - -#cmakedefine DEBUG 1 - -#cmakedefine HAVE_SYS_MMAN_H 1 -#cmakedefine HAVE_SYS_WAIT_H 1 -#cmakedefine HAVE_UNISTD_H 1 - -#cmakedefine SIZEOF_LONG @SIZEOF_LONG@ - -#endif /* _COLM_CONFIG_H */ diff --git a/configure.ac b/configure.ac index d0d08f80..9b80ae00 100644 --- a/configure.ac +++ b/configure.ac @@ -195,9 +195,9 @@ AC_ARG_WITH(subject, [ SUBJ_AAPL_CPPFLAGS='-I$(abs_top_builddir)/aapl' - SUBJ_COLM_BIN='$(abs_top_builddir)/colm/colm' - SUBJ_COLM_CPPFLAGS='-I$(abs_top_builddir)/colm/include' - SUBJ_COLM_LDFLAGS='-L$(abs_top_builddir)/colm/.libs -Wl,-rpath,${abs_top_builddir}/colm/.libs' + SUBJ_COLM_BIN='$(abs_top_builddir)/src/colm' + SUBJ_COLM_CPPFLAGS='-I$(abs_top_builddir)/src/include' + SUBJ_COLM_LDFLAGS='-L$(abs_top_builddir)/src/.libs -Wl,-rpath,${abs_top_builddir}/src/.libs' SUBJ_RAGEL_BIN='$(abs_top_builddir)/ragel/ragel' SUBJ_RAGEL_CPPFLAGS='-I$(abs_top_builddir)/ragel/include -I$(abs_top_builddir)/aapl' @@ -415,12 +415,12 @@ dnl Wrap up. dnl AC_SUBST(SED_SUBST) -AC_CONFIG_HEADERS([src/config.h colm/defs.h]) +AC_CONFIG_HEADERS([src/config.h src/defs.h]) AC_OUTPUT([ Makefile aapl/Makefile libfsm/Makefile - colm/Makefile + src/Makefile cgil/Makefile test/Makefile test/aapl.d/Makefile diff --git a/src/.gitignore b/src/.gitignore index 8b728643..082d9db4 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,11 +1,40 @@ +/*.o +/*.lo +/Makefile.in +/Makefile +/.*.d +/colm +/defs.h /config.h -/config.h.in -/config.h.in~ +/version.h +/tags +/.deps +/libcolm.a +/libcolm.la +/.libs /stamp-h1 /stamp-h2 -/Makefile +/bootstrap[012] +/gen +/tar +/include + +/libprog.a /CMakeFiles /cmake_install.cmake -/install_manifest.txt +/*.exe + +# Common testing files. +/tmp.lm +/tmp.c +/tmp +/input[0-9] +/input +/output +/log + +/colm-wrap + +/config.h.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7afa276d..3d855523 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,187 @@ -configure_file(config.h.cmake.in config.h @ONLY) +# Package name +set(_PACKAGE_NAME colm) + +# Read project configuration from ../configure.ac file +file(STRINGS ../configure.ac _PROJECT_CONFIGS + REGEX "(COLM_VERSION=)|(COLM_PUBDATE=)") +foreach(_PROJECT_CONFIG ${_PROJECT_CONFIGS}) + if(_PROJECT_CONFIG MATCHES "COLM_VERSION=\"([^\"]+)") + string(STRIP ${CMAKE_MATCH_1} COLM_VERSION) + endif() + if(_PROJECT_CONFIG MATCHES "COLM_PUBDATE=\"([^\"]+)") + string(STRIP ${CMAKE_MATCH_1} COLM_PUBDATE) + endif() +endforeach() + +# Generate headers +configure_file(version.h.cmake.in version.h @ONLY) +configure_file(defs.h.cmake.in defs.h @ONLY) +configure_file(colm-config.cmake.in +"${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" @ONLY) + +# Runtime headers +set(RUNTIME_HDR + bytecode.h debug.h pool.h input.h + pdarun.h map.h type.h tree.h struct.h program.h colm.h internal.h) + +foreach(_hdr defs.h) + list(APPEND RUNTIME_HDR "${CMAKE_CURRENT_BINARY_DIR}/${_hdr}") +endforeach() + +# Other CMake modules +include(GNUInstallDirs) + +# libcolm + +add_library(libcolm + map.c pdarun.c list.c input.c stream.c debug.c + codevect.c pool.c string.c tree.c iter.c + bytecode.c program.c struct.c commit.c + print.c) + +target_include_directories(libcolm + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../src> + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + +set_target_properties(libcolm PROPERTIES + OUTPUT_NAME colm) + +# libprog + +add_library(libprog + buffer.h bytecode.h colm.h debug.h dotgen.h fsmcodegen.h fsmgraph.h + input.h keyops.h map.h compiler.h + parsetree.h pcheck.h pdacodegen.h pdagraph.h pdarun.h pool.h redbuild.h + redfsm.h rtvector.h tree.h global.h colm.h parser.h cstring.h + internal.h + resolve.cc lookup.cc synthesis.cc parsetree.cc + fsmstate.cc fsmbase.cc fsmattach.cc fsmmin.cc + fsmgraph.cc pdagraph.cc pdabuild.cc pdacodegen.cc fsmcodegen.cc + redfsm.cc fsmexec.cc redbuild.cc closure.cc fsmap.cc + dotgen.cc pcheck.cc ctinput.cc declare.cc codegen.cc + exports.cc compiler.cc parser.cc reduce.cc) + +target_include_directories(libprog + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../aapl> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>) + +set_target_properties(libprog PROPERTIES + OUTPUT_NAME prog) + +# bootstrap0 + +add_executable(bootstrap0 + consinit.cc consinit.h main.cc) + +target_link_libraries(bootstrap0 libprog libcolm) + +set_property(TARGET bootstrap0 APPEND PROPERTY + COMPILE_DEFINITIONS CONS_INIT ${common_COMPILE_DEFINITIONS}) + +set_property(TARGET bootstrap0 APPEND PROPERTY + COMPILE_FLAGS -fpermissive) + +# bootstrap1 + +make_directory("${CMAKE_CURRENT_BINARY_DIR}/gen") + +add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse1.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.h" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.cc" + COMMAND bootstrap0 + ARGS -c -o parse1.c -e if1.h -x if1.cc + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") + +add_executable(bootstrap1 + loadinit.h loadinit.cc main.cc + "${CMAKE_CURRENT_BINARY_DIR}/gen/parse1.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if1.cc") + +target_link_libraries(bootstrap1 libprog libcolm) + +set_property(TARGET bootstrap1 APPEND PROPERTY + COMPILE_DEFINITIONS LOAD_INIT ${common_COMPILE_DEFINITIONS}) + +# bootstrap2 + +add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse2.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.h" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.cc" + COMMAND bootstrap1 + ARGS -c -o parse2.c -e if2.h -x if2.cc "${CMAKE_CURRENT_LIST_DIR}/colm.lm" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") + +add_executable(bootstrap2 + main.cc loadboot2.cc loadfinal.h version.h + "${CMAKE_CURRENT_BINARY_DIR}/gen/parse2.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if2.cc") + +target_link_libraries(bootstrap2 libprog libcolm) + +set_property(TARGET bootstrap2 APPEND PROPERTY + COMPILE_DEFINITIONS LOAD_COLM ${common_COMPILE_DEFINITIONS}) + +# colm + +add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/gen/parse3.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.h" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.cc" + COMMAND bootstrap2 + ARGS -I "${CMAKE_CURRENT_LIST_DIR}" -c -o parse3.c -e if3.h -x if3.cc "${CMAKE_CURRENT_LIST_DIR}/prog.lm" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen") + +add_executable(colm + main.cc loadcolm.cc loadfinal.h version.h + "${CMAKE_CURRENT_BINARY_DIR}/gen/parse3.c" + "${CMAKE_CURRENT_BINARY_DIR}/gen/if3.cc") + +if(BUILD_STANDALONE) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + target_link_libraries(colm -static) + else() + message(FATAL_ERROR "Unsupported toolset for standalone build.") + endif() +endif() + +target_link_libraries(colm libprog libcolm) + +set_property(TARGET colm APPEND PROPERTY + COMPILE_DEFINITIONS LOAD_COLM ${common_COMPILE_DEFINITIONS}) + +if(${PROJECT_NAME}_MAKE_INSTALL) + if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) + set(CMAKE_INSTALL_CMAKEDIR + "${CMAKE_INSTALL_LIBDIR}/cmake/${_PACKAGE_NAME}" + CACHE STRING "CMake packages") + endif() + install(FILES ${RUNTIME_HDR} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/colm") + install(TARGETS libcolm colm + EXPORT ${_PACKAGE_NAME}-targets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(EXPORT ${_PACKAGE_NAME}-targets + NAMESPACE ${_PACKAGE_NAME}:: + DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") + export(EXPORT ${_PACKAGE_NAME}-targets + NAMESPACE ${_PACKAGE_NAME}:: + FILE "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-targets.cmake") + include(CMakePackageConfigHelpers) + write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" + VERSION ${COLM_VERSION} + COMPATIBILITY AnyNewerVersion) + install(FILES + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" + DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") +endif() diff --git a/colm/ChangeLog b/src/ChangeLog index 1479d2d5..1479d2d5 100644 --- a/colm/ChangeLog +++ b/src/ChangeLog diff --git a/colm/Makefile.am b/src/Makefile.am index 5a53f040..5a53f040 100644 --- a/colm/Makefile.am +++ b/src/Makefile.am diff --git a/colm/buffer.h b/src/buffer.h index 58db85de..58db85de 100644 --- a/colm/buffer.h +++ b/src/buffer.h diff --git a/colm/bytecode.c b/src/bytecode.c index 39aee070..39aee070 100644 --- a/colm/bytecode.c +++ b/src/bytecode.c diff --git a/colm/bytecode.h b/src/bytecode.h index 02cd78f4..02cd78f4 100644 --- a/colm/bytecode.h +++ b/src/bytecode.h diff --git a/colm/closure.cc b/src/closure.cc index 066bf12b..066bf12b 100644 --- a/colm/closure.cc +++ b/src/closure.cc diff --git a/colm/codegen.cc b/src/codegen.cc index 6ff9983f..6ff9983f 100644 --- a/colm/codegen.cc +++ b/src/codegen.cc diff --git a/colm/codevect.c b/src/codevect.c index 50b86336..50b86336 100644 --- a/colm/codevect.c +++ b/src/codevect.c diff --git a/colm/colm-config.cmake.in b/src/colm-config.cmake.in index 7e3b8f27..7e3b8f27 100644 --- a/colm/colm-config.cmake.in +++ b/src/colm-config.cmake.in diff --git a/colm/colm-wrap.sh b/src/colm-wrap.sh index 8140afca..8140afca 100644 --- a/colm/colm-wrap.sh +++ b/src/colm-wrap.sh diff --git a/colm/colm.h b/src/colm.h index 39506cab..39506cab 100644 --- a/colm/colm.h +++ b/src/colm.h diff --git a/colm/colm.lm b/src/colm.lm index c95d0c41..c95d0c41 100644 --- a/colm/colm.lm +++ b/src/colm.lm diff --git a/colm/colmex.h b/src/colmex.h index 2abc7b2f..2abc7b2f 100644 --- a/colm/colmex.h +++ b/src/colmex.h diff --git a/colm/commit.c b/src/commit.c index 28da8c1d..28da8c1d 100644 --- a/colm/commit.c +++ b/src/commit.c diff --git a/colm/compiler.cc b/src/compiler.cc index 72f87dac..72f87dac 100644 --- a/colm/compiler.cc +++ b/src/compiler.cc diff --git a/colm/compiler.h b/src/compiler.h index 67d5b40e..67d5b40e 100644 --- a/colm/compiler.h +++ b/src/compiler.h diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in index 12117f4d..455cffe7 100644 --- a/src/config.h.cmake.in +++ b/src/config.h.cmake.in @@ -9,7 +9,6 @@ #cmakedefine HAVE_SYS_WAIT_H 1 #cmakedefine HAVE_UNISTD_H 1 -#cmakedefine SIZEOF_INT @SIZEOF_INT@ #cmakedefine SIZEOF_LONG @SIZEOF_LONG@ #endif /* _COLM_CONFIG_H */ diff --git a/colm/consinit.cc b/src/consinit.cc index 4f59b07c..4f59b07c 100644 --- a/colm/consinit.cc +++ b/src/consinit.cc diff --git a/colm/consinit.h b/src/consinit.h index 614f19d4..614f19d4 100644 --- a/colm/consinit.h +++ b/src/consinit.h diff --git a/colm/cstring.h b/src/cstring.h index 3c285153..3c285153 100644 --- a/colm/cstring.h +++ b/src/cstring.h diff --git a/colm/ctinput.cc b/src/ctinput.cc index f8267487..f8267487 100644 --- a/colm/ctinput.cc +++ b/src/ctinput.cc diff --git a/colm/debug.c b/src/debug.c index 1cfd24d7..1cfd24d7 100644 --- a/colm/debug.c +++ b/src/debug.c diff --git a/colm/debug.h b/src/debug.h index 1870f553..1870f553 100644 --- a/colm/debug.h +++ b/src/debug.h diff --git a/colm/declare.cc b/src/declare.cc index b96092e2..b96092e2 100644 --- a/colm/declare.cc +++ b/src/declare.cc diff --git a/colm/defs.h.cmake.in b/src/defs.h.cmake.in index c4cf8844..c4cf8844 100644 --- a/colm/defs.h.cmake.in +++ b/src/defs.h.cmake.in diff --git a/colm/defs.h.in b/src/defs.h.in index a91e2ff2..a91e2ff2 100644 --- a/colm/defs.h.in +++ b/src/defs.h.in diff --git a/colm/dotgen.cc b/src/dotgen.cc index 42f54159..42f54159 100644 --- a/colm/dotgen.cc +++ b/src/dotgen.cc diff --git a/colm/dotgen.h b/src/dotgen.h index 8e8f694b..8e8f694b 100644 --- a/colm/dotgen.h +++ b/src/dotgen.h diff --git a/colm/exports.cc b/src/exports.cc index 988499db..988499db 100644 --- a/colm/exports.cc +++ b/src/exports.cc diff --git a/colm/fsmap.cc b/src/fsmap.cc index 3e1ae913..3e1ae913 100644 --- a/colm/fsmap.cc +++ b/src/fsmap.cc diff --git a/colm/fsmattach.cc b/src/fsmattach.cc index bc8571b2..bc8571b2 100644 --- a/colm/fsmattach.cc +++ b/src/fsmattach.cc diff --git a/colm/fsmbase.cc b/src/fsmbase.cc index 52698a1a..52698a1a 100644 --- a/colm/fsmbase.cc +++ b/src/fsmbase.cc diff --git a/colm/fsmcodegen.cc b/src/fsmcodegen.cc index 5d63c079..5d63c079 100644 --- a/colm/fsmcodegen.cc +++ b/src/fsmcodegen.cc diff --git a/colm/fsmcodegen.h b/src/fsmcodegen.h index c8f66c9c..c8f66c9c 100644 --- a/colm/fsmcodegen.h +++ b/src/fsmcodegen.h diff --git a/colm/fsmexec.cc b/src/fsmexec.cc index 8aa4a072..8aa4a072 100644 --- a/colm/fsmexec.cc +++ b/src/fsmexec.cc diff --git a/colm/fsmgraph.cc b/src/fsmgraph.cc index 8cbfe29c..8cbfe29c 100644 --- a/colm/fsmgraph.cc +++ b/src/fsmgraph.cc diff --git a/colm/fsmgraph.h b/src/fsmgraph.h index 5b357499..5b357499 100644 --- a/colm/fsmgraph.h +++ b/src/fsmgraph.h diff --git a/colm/fsmmin.cc b/src/fsmmin.cc index f47500bd..f47500bd 100644 --- a/colm/fsmmin.cc +++ b/src/fsmmin.cc diff --git a/colm/fsmstate.cc b/src/fsmstate.cc index b3d1c313..b3d1c313 100644 --- a/colm/fsmstate.cc +++ b/src/fsmstate.cc diff --git a/colm/global.h b/src/global.h index 58b98077..58b98077 100644 --- a/colm/global.h +++ b/src/global.h diff --git a/colm/input.c b/src/input.c index 043791f2..043791f2 100644 --- a/colm/input.c +++ b/src/input.c diff --git a/colm/input.h b/src/input.h index 8cb20088..8cb20088 100644 --- a/colm/input.h +++ b/src/input.h diff --git a/colm/internal.h b/src/internal.h index e6e1fa7e..e6e1fa7e 100644 --- a/colm/internal.h +++ b/src/internal.h diff --git a/colm/iter.c b/src/iter.c index 66974f4a..66974f4a 100644 --- a/colm/iter.c +++ b/src/iter.c diff --git a/colm/keyops.h b/src/keyops.h index ed58db8d..ed58db8d 100644 --- a/colm/keyops.h +++ b/src/keyops.h diff --git a/colm/list.c b/src/list.c index 2003674a..2003674a 100644 --- a/colm/list.c +++ b/src/list.c diff --git a/colm/lmparse.kh b/src/lmparse.kh index 13977a9e..13977a9e 100644 --- a/colm/lmparse.kh +++ b/src/lmparse.kh diff --git a/colm/lmparse.kl b/src/lmparse.kl index b64bd344..b64bd344 100644 --- a/colm/lmparse.kl +++ b/src/lmparse.kl diff --git a/colm/lmscan.h b/src/lmscan.h index ff3de0ad..ff3de0ad 100644 --- a/colm/lmscan.h +++ b/src/lmscan.h diff --git a/colm/lmscan.rl b/src/lmscan.rl index 231e2689..231e2689 100644 --- a/colm/lmscan.rl +++ b/src/lmscan.rl diff --git a/colm/loadboot2.cc b/src/loadboot2.cc index b2553739..b2553739 100644 --- a/colm/loadboot2.cc +++ b/src/loadboot2.cc diff --git a/colm/loadcolm.cc b/src/loadcolm.cc index f16779be..f16779be 100644 --- a/colm/loadcolm.cc +++ b/src/loadcolm.cc diff --git a/colm/loadfinal.cc b/src/loadfinal.cc index 0fddd360..0fddd360 100644 --- a/colm/loadfinal.cc +++ b/src/loadfinal.cc diff --git a/colm/loadfinal.h b/src/loadfinal.h index 0c888f9a..0c888f9a 100644 --- a/colm/loadfinal.h +++ b/src/loadfinal.h diff --git a/colm/loadinit.cc b/src/loadinit.cc index f5281da3..f5281da3 100644 --- a/colm/loadinit.cc +++ b/src/loadinit.cc diff --git a/colm/loadinit.h b/src/loadinit.h index 93a18444..93a18444 100644 --- a/colm/loadinit.h +++ b/src/loadinit.h diff --git a/colm/lookup.cc b/src/lookup.cc index cb243dc6..cb243dc6 100644 --- a/colm/lookup.cc +++ b/src/lookup.cc diff --git a/colm/main.cc b/src/main.cc index a3a7d2c9..a3a7d2c9 100644 --- a/colm/main.cc +++ b/src/main.cc diff --git a/colm/map.cc b/src/map.cc index 4d3bd090..4d3bd090 100644 --- a/colm/map.cc +++ b/src/map.cc diff --git a/colm/parser.cc b/src/parser.cc index a41288b1..a41288b1 100644 --- a/colm/parser.cc +++ b/src/parser.cc diff --git a/colm/parser.h b/src/parser.h index aafa3f2b..aafa3f2b 100644 --- a/colm/parser.h +++ b/src/parser.h diff --git a/colm/parsetree.cc b/src/parsetree.cc index 572f0610..572f0610 100644 --- a/colm/parsetree.cc +++ b/src/parsetree.cc diff --git a/colm/parsetree.h b/src/parsetree.h index f2d94226..f2d94226 100644 --- a/colm/parsetree.h +++ b/src/parsetree.h diff --git a/colm/pcheck.cc b/src/pcheck.cc index 6f41a7ce..6f41a7ce 100644 --- a/colm/pcheck.cc +++ b/src/pcheck.cc diff --git a/colm/pcheck.h b/src/pcheck.h index 96746470..96746470 100644 --- a/colm/pcheck.h +++ b/src/pcheck.h diff --git a/colm/pdabuild.cc b/src/pdabuild.cc index 27cd9616..27cd9616 100644 --- a/colm/pdabuild.cc +++ b/src/pdabuild.cc diff --git a/colm/pdacodegen.cc b/src/pdacodegen.cc index d6435ea9..d6435ea9 100644 --- a/colm/pdacodegen.cc +++ b/src/pdacodegen.cc diff --git a/colm/pdacodegen.h b/src/pdacodegen.h index 759dd6e0..759dd6e0 100644 --- a/colm/pdacodegen.h +++ b/src/pdacodegen.h diff --git a/colm/pdagraph.cc b/src/pdagraph.cc index c18c61e1..c18c61e1 100644 --- a/colm/pdagraph.cc +++ b/src/pdagraph.cc diff --git a/colm/pdagraph.h b/src/pdagraph.h index 5cfc2a76..5cfc2a76 100644 --- a/colm/pdagraph.h +++ b/src/pdagraph.h diff --git a/colm/pdarun.c b/src/pdarun.c index f1885ec6..f1885ec6 100644 --- a/colm/pdarun.c +++ b/src/pdarun.c diff --git a/colm/pdarun.h b/src/pdarun.h index 4003b9be..4003b9be 100644 --- a/colm/pdarun.h +++ b/src/pdarun.h diff --git a/colm/pool.c b/src/pool.c index ffb32636..ffb32636 100644 --- a/colm/pool.c +++ b/src/pool.c diff --git a/colm/pool.h b/src/pool.h index 5e8f1de0..5e8f1de0 100644 --- a/colm/pool.h +++ b/src/pool.h diff --git a/colm/print.c b/src/print.c index 363a7eea..363a7eea 100644 --- a/colm/print.c +++ b/src/print.c diff --git a/colm/prog.lm b/src/prog.lm index 3a11e342..3a11e342 100644 --- a/colm/prog.lm +++ b/src/prog.lm diff --git a/colm/program.c b/src/program.c index a9459ccf..a9459ccf 100644 --- a/colm/program.c +++ b/src/program.c diff --git a/colm/program.h b/src/program.h index 8ba716d4..8ba716d4 100644 --- a/colm/program.h +++ b/src/program.h diff --git a/colm/redbuild.cc b/src/redbuild.cc index 7e0396d7..7e0396d7 100644 --- a/colm/redbuild.cc +++ b/src/redbuild.cc diff --git a/colm/redbuild.h b/src/redbuild.h index e9ad0465..e9ad0465 100644 --- a/colm/redbuild.h +++ b/src/redbuild.h diff --git a/colm/redfsm.cc b/src/redfsm.cc index d79a1e32..d79a1e32 100644 --- a/colm/redfsm.cc +++ b/src/redfsm.cc diff --git a/colm/redfsm.h b/src/redfsm.h index 618fbd61..618fbd61 100644 --- a/colm/redfsm.h +++ b/src/redfsm.h diff --git a/colm/reduce.cc b/src/reduce.cc index 89a95015..89a95015 100644 --- a/colm/reduce.cc +++ b/src/reduce.cc diff --git a/colm/resolve.cc b/src/resolve.cc index c1f2cb3d..c1f2cb3d 100644 --- a/colm/resolve.cc +++ b/src/resolve.cc diff --git a/colm/rtvector.h b/src/rtvector.h index e15d3f2a..e15d3f2a 100644 --- a/colm/rtvector.h +++ b/src/rtvector.h diff --git a/colm/stream.c b/src/stream.c index 77779aae..77779aae 100644 --- a/colm/stream.c +++ b/src/stream.c diff --git a/colm/string.c b/src/string.c index d1d16aa9..d1d16aa9 100644 --- a/colm/string.c +++ b/src/string.c diff --git a/colm/struct.c b/src/struct.c index 5ee58ed3..5ee58ed3 100644 --- a/colm/struct.c +++ b/src/struct.c diff --git a/colm/struct.h b/src/struct.h index 13f78c40..13f78c40 100644 --- a/colm/struct.h +++ b/src/struct.h diff --git a/colm/synthesis.cc b/src/synthesis.cc index 17c2440a..17c2440a 100644 --- a/colm/synthesis.cc +++ b/src/synthesis.cc diff --git a/colm/tree.c b/src/tree.c index e05681b9..e05681b9 100644 --- a/colm/tree.c +++ b/src/tree.c diff --git a/colm/tree.h b/src/tree.h index 97833c6f..97833c6f 100644 --- a/colm/tree.h +++ b/src/tree.h diff --git a/colm/type.h b/src/type.h index dca8f2ad..dca8f2ad 100644 --- a/colm/type.h +++ b/src/type.h diff --git a/colm/version.h.cmake.in b/src/version.h.cmake.in index 0b45a8f0..0b45a8f0 100644 --- a/colm/version.h.cmake.in +++ b/src/version.h.cmake.in diff --git a/test/rlhc.d/Makefile.am b/test/rlhc.d/Makefile.am index 880a34cc..cface1e9 100644 --- a/test/rlhc.d/Makefile.am +++ b/test/rlhc.d/Makefile.am @@ -1,4 +1,4 @@ -COLM_BIN = ../../colm/colm +COLM_BIN = ../../src/colm RLHC_DEP = \ rlhc-host.lm \ diff --git a/test/rlparse.d/Makefile.am b/test/rlparse.d/Makefile.am index 1d8e9619..fd4cdb9d 100644 --- a/test/rlparse.d/Makefile.am +++ b/test/rlparse.d/Makefile.am @@ -1,6 +1,6 @@ -COLM_BIN = ../../colm/colm -COLM_xCPPFLAGS = -I../../colm/include -COLM_xLDFLAGS = -L../../colm +COLM_BIN = ../../src/colm +COLM_xCPPFLAGS = -I../../src/include +COLM_xLDFLAGS = -L../../src noinst_PROGRAMS = rlparse diff --git a/test/trans.d/Makefile.am b/test/trans.d/Makefile.am index 4f549afe..a1e3719e 100644 --- a/test/trans.d/Makefile.am +++ b/test/trans.d/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = ../../colm/colm +COLM_BIN = ../../src/colm -COLM_xCPPFLAGS = -I../../colm/include -COLM_xLDFLAGS = -L../../colm +COLM_xCPPFLAGS = -I../../src/include +COLM_xLDFLAGS = -L../../src noinst_PROGRAMS = trans |