Fixing cmake dependencies and "make {install,clean}"

Also includes a bunch of cleanup.
This commit is contained in:
Robin Sommer 2013-05-15 20:22:51 -07:00
parent 10dc8b9279
commit 8752870967
86 changed files with 130 additions and 116 deletions

View file

@ -193,7 +193,7 @@ void init_alternative_mode()
snprintf(auto_gen_comment, n,
"This file was automatically generated by bifcl from %s (%s mode).",
input_filename_with_path, plugin ? "plugin" : "subdir");
input_filename_with_path, plugin ? "plugin" : "alternative");
fprintf(fp_bro_init, "# %s\n\n", auto_gen_comment);
fprintf(fp_func_def, "// %s\n\n", auto_gen_comment);
@ -211,10 +211,15 @@ void init_alternative_mode()
*p = '_';
}
fprintf(fp_func_h, "#if defined(BRO_IN_NETVAR) || ! defined(%s)\n", guard);
fprintf(fp_func_h, "#ifndef BRO_IN_NETVAR\n");
fprintf(fp_func_h, "#ifndef %s\n", guard);
fprintf(fp_func_h, "#define %s\n", guard);
fprintf(fp_func_h, "\n");
fprintf(fp_func_h, "#include \"bro-bif.h\"\n");
fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "\n");
fprintf(fp_func_def, "\n");
fprintf(fp_func_def, "#include \"%s.h\"\n", input_filename);