--- mcore-src/trunk/mcore-tools/src/Makefile	2015/09/03 13:57:57	2448
+++ mcore-src/trunk/mcore-tools/src/Makefile	2016/01/29 09:01:24	2747
@@ -3,7 +3,7 @@
 
 SUBDIRS = include modules
 FILES = mcored.confd
-SCRIPTS = generate-certificate mcored mcorepasswd mcore-controld mcore-register-client mcore-serial
+SCRIPTS = generate-certificate update-certificate mcored mcorepasswd mcore-controld mcore-register-client mcore-serial mcore-request-configuration mcore-controlserver mcore-client-deactivated mcore-session
 PROGS = xinfo.o xinfo
 
 ifeq ($(SYSTEMINIT),systemd)
@@ -16,33 +16,46 @@
 
 xinfo_CFLAGS = -lX11
 
-INSTALLDIRS = $(SUBDIRS:%=install-%)
+INSTALL_COMMONDIRS = $(SUBDIRS:%=install-common-%)
+INSTALL_CLIENTDIRS = $(SUBDIRS:%=install-client-%)
+INSTALL_CONTROLDIRS = $(SUBDIRS:%=install-control-%)
 CLEANDIRS = $(SUBDIRS:%=clean-%)
 
 all: $(SUBDIRS) $(PROGS) $(SCRIPTS) $(FILES)
 
-install: $(INSTALLDIRS) install-client all
+install: install-common install-client install-control all
 
-install-common: all
+install-common: $(INSTALL_COMMONDIRS) all
+	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
 	$(INSTALL) -m0755 mcorepasswd $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0755 generate-certificate $(DESTDIR)/$(MCORE_LIBDIR)/mcore-generate-certificate
 	$(LN) $(MCORE_LIBDIR)/mcorepasswd $(DESTDIR)/$(BINDIR)/mcorepasswd
 	$(LN) $(MCORE_LIBDIR)/mcore-generate-certificate $(DESTDIR)/$(BINDIR)/mcore-generate-certificate
 
-install-client: install-common install-$(SYSTEMINIT) all
-	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
+install-client: $(INSTALL_CLIENTDIRS) all
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
-	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
 	$(INSTALL) -m0755 xinfo $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -m0755 mcore-serial $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-controlserver $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-client-deactivated $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-session $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -m0755 mcore-register-client $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-request-configuration $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -m0755 mcored $(DESTDIR)/$(MCORE_LIBDIR)
 	$(LN) $(MCORE_LIBDIR)/mcored $(DESTDIR)/$(SBINDIR)/mcored
 
+install-control: $(INSTALL_CONTROLDIRS) all
+	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0755 mcore-controld $(DESTDIR)/$(MCORE_LIBDIR)
+	$(LN) $(MCORE_LIBDIR)/mcore-controld $(DESTDIR)/$(SBINDIR)/mcore-controld
+
 clean: $(CLEANDIRS)
 	rm -f $(PROGS)
 	rm -f $(SCRIPTS)
@@ -51,16 +64,24 @@
 $(SUBDIRS):
 	$(MAKE) -C $@
 
-$(INSTALLDIRS):
-	$(MAKE) -C $(@:install-%=%) install
+$(INSTALL_COMMONDIRS):
+	$(MAKE) -C $(@:install-common-%=%) install-common
+
+$(INSTALL_CLIENTDIRS):
+	$(MAKE) -C $(@:install-client-%=%) install-client
+
+$(INSTALL_CONTROLDIRS):
+	$(MAKE) -C $(@:install-control-%=%) install-control
 
 $(CLEANDIRS):
 	$(MAKE) -C $(@:clean-%=%) clean
 
-
 .PHONY: $(SUBDIRS)
-.PHONY: $(INSTALLDIRS)
+.PHONY: $(INSTALL_COMMONDIRS)
+.PHONY: $(INSTALL_CLIENTDIRS)
+.PHONY: $(INSTALL_CONTROLDIRS)
 .PHONY: $(CLEANDIRS)
 .PHONY: install-common
 .PHONY: install-client
+.PHONY: install-control
 .PHONY: all install clean