From 2048448601aa27f993268ef67bf0eeda3625ef4e Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 12 Aug 2011 23:23:33 +0200
Subject: retiolum: go more enterprise

---
 retiolum/Makefile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'retiolum/Makefile')

diff --git a/retiolum/Makefile b/retiolum/Makefile
index e58e2ece..407d8c60 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -1,27 +1,21 @@
-RETIOLUM_HOSTS = /etc/tinc/retiolum/hosts
+.PHONY: update all install hosts
 
-.PHONY: update it all so install
+EXES := update_tinc_hosts fillxx update-retiolum-hosts
 
 all: update links 
 
-links: 
-	ln -sf $$PWD/bin/update_tinc_hosts ../bin/update_tinc_hosts
-	ln -sf $$PWD/bin/fillxx ../bin/fillxx
-
-it: so
-so: it
-
-hosts/:
-	@echo "Writing new copy of hosts"
-	[ -e $(RETIOLUM_HOSTS) ] || mkdir -p $(RETIOLUM_HOSTS)
-	cp -r hosts/* $(RETIOLUM_HOSTS)/
+links:
+	for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done
 
+hosts:
+	bin/update-retiolum-hosts
 
 install: update
 	@# will not run automatically
 	scripts/tinc_setup/install.sh
+	scripts/autostart/create-startup.sh
 
-update: hosts/
+update: hosts
 	@echo creating Magic
 	bin/update_tinc_hosts "create magic" || true
 	@echo adding hosts
-- 
cgit v1.2.3