--- mcore-src/trunk/mcore-tools/src/Makefile	2014/01/10 13:07:03	2142
+++ mcore-src/trunk/mcore-tools/src/Makefile	2014/01/11 00:01:45	2232
@@ -1,19 +1,72 @@
-include ../Makefile.inc
-
-XINFO_CFLAGS = -lX11
-
-all: xinfo
-
-xinfo: xinfo.o
-	$(CC) $(XINFO_CFLAGS) -o $@ $<
 
-*.o: *.c
-	$(CC) -c -o $@ $<
+include ../Makefile.inc
 
-install: xinfo
+SUBDIRS = include modules
+FILES = mcored.confd
+SCRIPTS = generate-certificate mcored mcorepasswd
+PROGS = xinfo.o xinfo
+
+ifeq ($(SYSTEMINIT),systemd)
+	CLIENT_CLASSES += systemd
+	SYSTEMDSYSTEMUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
+	SYSTEMDSYSTEMCONFDIR = $(shell $(PKGCONFIG) --variable=systemdsystemconfdir systemd)
+	RUNDIR = /run
+	FILES += mcored.service
+else
+	CLIENT_CLASSES += sysvinit
+	SYSVRCDDIR = $(SYSCONFDIR)/rc.d
+	SYSVINITDDIR = $(SYSRCDDIR)/init.d
+	RUNDIR = $(LOCALSTATEDIR)/run
+	FILES += mcored.rc
+endif
+
+xinfo_CFLAGS = -lX11
+
+INSTALLDIRS = $(SUBDIRS:%=install-%)
+CLEANDIRS = $(SUBDIRS:%=clean-%)
+
+all: $(SUBDIRS) $(PROGS) $(SCRIPTS) $(FILES)
+
+install: $(INSTALLDIRS) install-client-services-$(SYSTEMINIT) all
+	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0755 xinfo $(DESTDIR)/$(BINDIR)
-
-clean:
-	rm -f *.o xinfo
-
+	$(INSTALL) -m0755 mcorepasswd $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0755 generate-certificate $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0755 mcored $(DESTDIR)/$(MCORE_LIBDIR)
+	$(LN) $(MCORE_LIBDIR)/mcorepasswd $(DESTDIR)/$(BINDIR)/mcorepasswd
+	$(LN) $(MCORE_LIBDIR)/mcore-generate-certificate $(DESTDIR)/$(BINDIR)/mcore-generate-certificate
+	$(LN) $(MCORE_LIBDIR)/mcored $(DESTDIR)/$(SBINDIR)/mcored
+
+install-client-services-sysvinit:
+	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SYSVINITDDIR)
+	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
+	$(INSTALL) -m0755 mcored.rc $(DESTDIR)/$(SYSVINITDDIR)/mcored
+
+install-client-services-systemd:
+	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
+	$(INSTALL) -m0644 mcored.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
+
+clean: $(CLEANDIRS)
+	rm -f $(PROGS)
+	rm -f $(SCRIPTS)
+	rm -f $(FILES)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
+
+$(INSTALLDIRS):
+	$(MAKE) -C $(@:install-%=%) install
+
+$(CLEANDIRS):
+	$(MAKE) -C $(@:clean-%=%) clean
+
+
+.PHONY: $(SUBDIRS)
+.PHONY: $(INSTALLDIRS)
+.PHONY: $(CLEANDIRS)
 .PHONY: all install clean