From 54f8f1d6b9d5f7b8056cb40ed92d2b10d08415ea Mon Sep 17 00:00:00 2001 From: Shepherd Date: Wed, 25 May 2011 23:54:30 +0100 Subject: added cooperative infest/host-based patches updated Makefile to handle new coop behavior added core installation files in core/ (install all the funky shit you will most likely need with the packet manager available renamed /root into /home added host-based patches added moved /infest/etc to /infest/etc_coop and etc_aggressive does the right thing now --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d31a7c9d..7e5641e3 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,16 @@ .PHONY: all all: select-target +.PHONY: aggressive +.PHONY: coop .PHONY: infest -infest: - infest/etc - infest/root +infest: aggressive +aggressive: + infest/etc_aggressive + infest/home +coop: + infest/etc_coop + infest/home install-debian: [ `which git` ] || apt-get install git-core -- cgit v1.2.3 From 1f1cff12f710f4776096261db9849f53ba7af449 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 12:17:47 +0200 Subject: added Make paths to all the modules --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7e5641e3..4e374372 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,8 @@ .PHONY: all all: select-target -.PHONY: aggressive -.PHONY: coop -.PHONY: infest +.PHONY: infest aggressive coop + infest: aggressive aggressive: infest/etc_aggressive @@ -22,4 +21,9 @@ install-debian: 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 -- cgit v1.2.3 From 4fa3e59a99b5c526c51366ca952f219f3b6a5674 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 12:32:53 +0200 Subject: fixed aggressive bug, pulled install to core updated makefile accordingly to handle core installer --- Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4e374372..50e94bd2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +DIST = debian .PHONY: all all: select-target @@ -13,11 +13,8 @@ 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 -- cgit v1.2.3 From 884100fc8ab0c46a08314bc68efe7fb0ee731c42 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 May 2011 12:56:48 +0200 Subject: infestation: kill capt. obvious Also move dep-foo to Makefile --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 50e94bd2..22b032ab 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,19 @@ DIST = debian -.PHONY: all +.PHONY: infest it all so aggressive coop all: select-target -.PHONY: infest aggressive coop - -infest: aggressive -aggressive: +it: so +so: it coop +aggressive: coop infest/etc_aggressive - infest/home coop: infest/etc_coop infest/home +# compatibility +infest: aggressive + install-core: core/$(DIST) -- cgit v1.2.3