Add CommonMark to C build

Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/21253aed
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/21253aed
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/21253aed

Branch: refs/heads/master
Commit: 21253aed567813023fa05d8b3f17181d0501812e
Parents: 67021f4
Author: Nick Wellnhofer <[email protected]>
Authored: Sun Nov 9 13:38:00 2014 +0100
Committer: Nick Wellnhofer <[email protected]>
Committed: Wed Dec 24 16:02:03 2014 +0100

----------------------------------------------------------------------
 compiler/common/charmonizer.c    | 4 ++++
 compiler/common/charmonizer.main | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/21253aed/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index 2a24d21..8e37274 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7808,6 +7808,8 @@ S_write_makefile(struct chaz_CLI *cli) {
                                         NULL);
     char *src_dir      = chaz_Util_join(dir_sep, base_dir, "src", NULL);
     char *include_dir  = chaz_Util_join(dir_sep, base_dir, "include", NULL);
+    char *cmark_dir    = chaz_Util_join(dir_sep, base_dir, "modules",
+                                        "CommonMark", "src", NULL);
     char *parse_header = chaz_Util_join(dir_sep, src_dir, "CFCParseHeader",
                                         NULL);
     char *cfc_exe      = chaz_Util_join("", "cfc", exe_ext, NULL);
@@ -7844,6 +7846,7 @@ S_write_makefile(struct chaz_CLI *cli) {
     chaz_CFlags_add_include_dir(makefile_cflags, ".");
     chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
     chaz_CFlags_add_include_dir(makefile_cflags, src_dir);
+    chaz_CFlags_add_include_dir(makefile_cflags, cmark_dir);
     if (chaz_CLI_defined(cli, "enable-coverage")) {
         chaz_CFlags_enable_code_coverage(makefile_cflags);
     }
@@ -7861,6 +7864,7 @@ S_write_makefile(struct chaz_CLI *cli) {
     sfc.test_cfc_objs = chaz_MakeFile_add_var(makefile, "TEST_CFC_OBJS", NULL);
 
     chaz_Make_list_files(src_dir, "c", S_source_file_callback, &sfc);
+    chaz_Make_list_files(cmark_dir, "c", S_source_file_callback, &sfc);
 
     scratch = chaz_Util_join("", parse_header, obj_ext, NULL);
     chaz_MakeVar_append(sfc.common_objs, scratch);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/21253aed/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 2c5a376..47694d3 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -128,6 +128,8 @@ S_write_makefile(struct chaz_CLI *cli) {
                                         NULL);
     char *src_dir      = chaz_Util_join(dir_sep, base_dir, "src", NULL);
     char *include_dir  = chaz_Util_join(dir_sep, base_dir, "include", NULL);
+    char *cmark_dir    = chaz_Util_join(dir_sep, base_dir, "modules",
+                                        "CommonMark", "src", NULL);
     char *parse_header = chaz_Util_join(dir_sep, src_dir, "CFCParseHeader",
                                         NULL);
     char *cfc_exe      = chaz_Util_join("", "cfc", exe_ext, NULL);
@@ -164,6 +166,7 @@ S_write_makefile(struct chaz_CLI *cli) {
     chaz_CFlags_add_include_dir(makefile_cflags, ".");
     chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
     chaz_CFlags_add_include_dir(makefile_cflags, src_dir);
+    chaz_CFlags_add_include_dir(makefile_cflags, cmark_dir);
     if (chaz_CLI_defined(cli, "enable-coverage")) {
         chaz_CFlags_enable_code_coverage(makefile_cflags);
     }
@@ -181,6 +184,7 @@ S_write_makefile(struct chaz_CLI *cli) {
     sfc.test_cfc_objs = chaz_MakeFile_add_var(makefile, "TEST_CFC_OBJS", NULL);
 
     chaz_Make_list_files(src_dir, "c", S_source_file_callback, &sfc);
+    chaz_Make_list_files(cmark_dir, "c", S_source_file_callback, &sfc);
 
     scratch = chaz_Util_join("", parse_header, obj_ext, NULL);
     chaz_MakeVar_append(sfc.common_objs, scratch);

Reply via email to