Makefile need love too

.gitignore

@@ -80,3 +80,31 @@ src/tests/test_os_regex
 src/tests/test_shared
 src/tests/test_os_xml
 src/tests/test_os_zlib
+
+
+# new location for binaries
+src/manage_agents
+src/ossec-agentd
+src/ossec-agentlessd
+src/ossec-authd
+src/ossec-csyslogd
+src/ossec-execd
+src/ossec-logcollector
+src/ossec-maild
+src/ossec-monitord
+src/ossec-regex
+src/ossec-remoted
+src/ossec-reportd
+src/ossec-syscheckd
+src/rootcheck_control
+src/syscheck_control
+src/syscheck_update
+src/verify-agent-conf
+src/agent-auth
+src/agent_control
+src/clear_stats
+src/list_agents
+src/ossec-analysisd
+src/ossec-logtest
+src/ossec-makelists
+src/ossec-dbd

.travis.yml

@@ -5,12 +5,17 @@ notifications:
     - "chat.freenode.net#ossec-dev"
 
 env:
-- DB=mysql OSSEC_TYPE=all GEOIP=yes
-- DB=mysql OSSEC_TYPE=all GEOIP=no
-- DB=none OSSEC_TYPE=all GEOIP=yes
-- DB=none OSSEC_TYPE=all GEOIP=no
+- DB=mysql OSSEC_TYPE=server GEOIP=yes
+- DB=mysql OSSEC_TYPE=server GEOIP=no
+- DB=pgsql OSSEC_TYPE=server GEOIP=yes
+- DB=pgsql OSSEC_TYPE=server GEOIP=no
+- DB=none OSSEC_TYPE=server GEOIP=yes
+- DB=none OSSEC_TYPE=server GEOIP=no
+- DB=none OSSEC_TYPE=server PRELUDE=yes
+- DB=none OSSEC_TYPE=local GEOIP=no
+- DB=none OSSEC_TYPE=hybrid GEOIP=no
 - DB=none OSSEC_TYPE=agent GEOIP=no
-- DB=none OSSEC_TYPE=windows_agent GEOIP=no
+- DB=none OSSEC_TYPE=winagent GEOIP=no
 - OSSEC_TYPE=test
 
 
@@ -23,30 +28,31 @@ matrix:
   fast_finish: true
   exclude:
     - compiler: clang
-      env: DB=none OSSEC_TYPE=windows_agent GEOIP=no
+      env: DB=none OSSEC_TYPE=winagent GEOIP=no
 
 
 
 before_script:
 - sudo apt-get update -qq
-- if [[ "$DB" == "mysql"  ]]; then ( cd src && make setdb  ); fi
 - if [[ "$GEOIP" == "yes"  ]]; then ( sudo apt-get install geoip-bin geoip-database libgeoip-dev libgeoip1 ); fi
-- if [[ "$GEOIP" == "yes"  ]]; then ( cd src && make setgeoip ); fi
-- if [[ "$OSSEC_TYPE" == "windows_agent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
+- if [[ "${PRELUDE}" = "yes" ]]; then (sudo apt-get install libprelude-dev ); fi
+- if [[ "$OSSEC_TYPE" == "winagent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
 - if [[ "$OSSEC_TYPE" == "test" ]]; then ( sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main " && sudo apt-get update && sudo apt-get install check valgrind ); fi
 
 
 
 script:
-- echo "CC = '${CC}'" # this seems suspicious, but without this travis do not uses the clang compiler correctly
-- if [[ "$OSSEC_TYPE" == "agent" ]]; then ( cd src/ && make setagent && make all ); fi
+- COMMAND="V=1 TARGET=${OSSEC_TYPE}"
+  && if ! [[ "${DB}" = "none" ]]; then COMMAND="${COMMAND} DATABASE=${DB}"; fi
+  && if [[ "${GEOIP}" = "yes" ]]; then COMMAND="${COMMAND} USE_GEOIP=1"; fi
+  && if [[ "${PRELUDE}" = "yes" ]]; then COMMAND="${COMMAND} USE_PRELUDE=1"; fi
+  && ( cd src/ && make --warn-undefined-variables ${COMMAND} settings && make --warn-undefined-variables ${COMMAND} -j )
+  && if ! [[ "$OSSEC_TYPE" = "test" || "$OSSEC_TYPE" = "winagent" ]]; then ( cd src/ && sudo make --warn-undefined-variables ${COMMAND} install ) fi
 
-- ( cd src/ && sudo make $OSSEC_TYPE )
-
-- if [[ "$OSSEC_TYPE" == "test" ]]; then ( cd src/tests/ && make run_valgrind ); fi
+- if [[ "$OSSEC_TYPE" == "test" ]]; then ( cd src/tests/ && make --warn-undefined-variables run_valgrind ); fi
 
 before_deploy:
 - mkdir travis-builds
-- if [[ "$OSSEC_TYPE" == "windows_agent" ]]; then ( cp src/win-pkg/ossec-agent.exe travis-builds/ossec-agent-bid:$TRAVIS_JOB_NUMBER-br:$TRAVIS_BRANCH.exe ); fi
+- if [[ "$OSSEC_TYPE" == "winagent" ]]; then ( cp src/win-pkg/ossec-agent.exe travis-builds/ossec-agent-bid:$TRAVIS_JOB_NUMBER-br:$TRAVIS_BRANCH.exe ); fi