Merge branch 'master' of github.com:krebscode/painload

1 files changed, 11 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 7e5641e3..50e94bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
-
+DIST = debian
 
 .PHONY: all
 all: select-target
 
-.PHONY: aggressive
-.PHONY: coop
-.PHONY: infest
+.PHONY: infest aggressive coop 
+
 infest: aggressive
 aggressive: 
 	infest/etc_aggressive
@@ -14,12 +13,14 @@ coop:
 	infest/etc_coop
 	infest/home
 
-install-debian:
-	[ `which git` ] || apt-get install git-core
-	[ `which tmux` ] || apt-get install tmux
-	[ `which screen` ] && apt-get remote screen
-	[ `which vim` ] || apt-get install vim
+install-core:
+	core/$(DIST)
 
 noise:
 	make -C modules/noise infest
-
+streams:
+	make -C modules/streams
+monitoring:
+	make -C modules/Monitoring debian
+zoneminder:
+	make -C modules/zoneminder fix it so hard