Commits

Jeremy Rossi committed 9a76120

more waf

  • Participants
  • Parent commits f53431a

Comments (0)

Files changed (8)

File src/external/zlib-1.2.3/wscript

         includes = ".",
         export_includes = ".",
         target = "z",
-        
     )

File src/os_analysisd/compiled_rules/wscript

     #ctx(rule="register_rule.sh build", target="compiled_rules.h")
     ctx.stlib(
         source = ctx.path.ant_glob("*.c"),
-        target = "analysisd_compiled_rules",
+        target = "os_analysisd_compiled_rules",
         defines = ['ARGV0="analysisd-compiled_rules"'],
         includes = ".",
         export_includes = ".",

File src/os_analysisd/wscript

         source=OTHER + " analysisd.c", 
         target="ossec-analysisd",
         defines = ['ARGV0="ossec-analysisd"'],
-        use = "os_analysisd_headers os_core os_analysisd_decoders os_analysisd_alerts analysisd_compiled_rules",
+        use = "os_analysisd_headers os_core os_analysisd_decoders os_analysisd_alerts os_analysisd_compiled_rules",
     )
     x= """
     ctx.program(
         source=OTHER + " testrule.c", 
         target="ossec-logtest",
         defines = ['ARGV0="ossec-analysisd"','TESTRULE'],
-        use = "os_analysisd_headers os_core os_analysisd_decoders os_analysisd_alerts analysisd_compiled_rules",
+        use = "os_analysisd_headers os_core os_analysisd_decoders os_analysisd_alerts os_analysisd_compiled_rules",
     )
     """
 

File src/os_rootcheckd/wscript

 #-c -g -Wall -I../ -I../headers   -DUSE_OPENSSL     -DARGV0=\"shared-libs\" -DXML_VAR=\"var\" -DOSSECHIDS *.c
 
 def build(ctx):
+    COREF  = """check_open_ports.c check_rc_pids.c check_rc_trojans.c run_rk_check.c 
+                check_rc_dev.c check_rc_ports.c check_rc_policy.c common.c common_rcl.c 
+                win-common.c unix-process.c check_rc_files.c check_rc_readproc.c 
+                os_string.c check_rc_if.c check_rc_sys.c rootcheck.c"""
     ctx.stlib(
-        source = """check_open_ports.c check_rc_pids.c check_rc_trojans.c run_rk_check.c 
-                    check_rc_dev.c check_rc_ports.c check_rc_policy.c common.c common_rcl.c 
-                    win-common.c unix-process.c check_rc_files.c check_rc_readproc.c 
-                    os_string.c check_rc_if.c check_rc_sys.c rootcheck.c""",
-        target = "os_rootchechd",
+        source = COREF + " config.c",
+        target = "os_rootcheckd",
+        defines = ['ARGV0="ossec-rootcheckd"', '_GNU_SOURCE'],
         includes = ".",
-        defines = ['ARGV0="ossec-rootcheckd"', '_GNU_SOURCE'],
         export_includes = '.',
-        use = "os_headers",
+        use = "os_headers os_zlib os_core",
     )
+    x="""
     ctx.program(
         source = "rootcheck-config.c",
         target = "ossec-rootcheck",
         defines = ['ARGV0="ossec-rootcheckd"', '_GNU_SOURCE', 'OSSECHIDS'],
-        use = "os_rootcheckd os_zlib os_core",
+        use = "os_headers os_rootcheckd os_zlib os_core",
     )
+    """

File src/os_syscheckd/run_check.c

 #include "os_crypto/sha1/sha1_op.h"
 #include "os_crypto/md5_sha1/md5_sha1_op.h"
 
-#include "rootcheck/rootcheck.h"
+#include "rootcheck.h"
 
 
 /** Prototypes **/

File src/os_syscheckd/syscheck.c

 #include "shared.h"
 #include "syscheck.h"
 
-#include "rootcheck/rootcheck.h"
+#include "rootcheck.h"
 
 int dump_syscheck_entry(config *syscheck, char *entry, int vals, int reg);
 

File src/os_syscheckd/wscript

         target = "ossec-syscheckd",
         defines = ['ARGV0="ossec-syscheckd"'],
         includes = ".",
-        use = "os_headers os_core",
+        use = "os_headers os_rootcheckd os_core os_rootcheckd",
     )
                                  uselib_store='OPENSSL')
         if libcrypto and libssl:
             ctx.env["USE_OPENSSL"] = True 
-    print ctx.env
 
     ctx.write_config_header('headers/build_config.h')
 
     ctx.recurse("os_kvd")
     ctx.recurse("os_dbd os_maild os_logcollectord os_monitord os_agentlessd os_remoted os_agentd os_execd")
     ctx.recurse("os_analysisd")
-    #ctx.recurse("os_rootcheckd os_syscheckd")
+    ctx.recurse("os_rootcheckd os_syscheckd")
     ctx.recurse("libos_cli")
     ctx.recurse("util")