X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=Makefile;h=3dede74d94b5b5950732874430b09a5fc8e3510b;hp=48d3b873b75a87df6219b8c18fa5c301e77a3a21;hb=0ac4fd1d17dce32e2ee028f563ff48ff16e24275;hpb=89048d5b9f63b1fbc3d1520221500ed139dbc28b

diff --git a/Makefile b/Makefile
index 48d3b87..3dede74 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CFLAGS+=	-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 .endif
 
 PREFIX?=	/usr/local
-BINDIR=		$(PREFIX)/libexec
+BINDIR=		$(PREFIX)/libexec/systemd
 SYSCONFDIR?=	/etc
 
 INSTALL_PROGRAM=	install -c -s -o root -g bin -m 555
@@ -34,7 +34,6 @@ LINKHN=		bin/systemd-hostnamed \
 
 DBUS_SERVICES=	org.freedesktop.hostname1.service \
 		org.freedesktop.locale1.service \
-		org.freedesktop.login1.service \
 		org.freedesktop.timedate1.service
 
 GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
@@ -45,13 +44,13 @@ CONFDIR=	conf
 POLICYDIR=	$(CONFDIR)/sysbus-policy
 ISPECTDIR=	$(CONFDIR)/introspect-xml
 SERVICEFDIR=	$(CONFDIR)/service-files
-POLKITDIR=  $(CONFDIR)/polkit-policy
+POLKITDIR=	$(CONFDIR)/polkit-policy
 
 INTFDIR=	$(SRCDIR)/interfaces
 
-DBUS_POLICYDIR=	$(SYSCONFDIR)/dbus-1/system.d
-DBUS_CONFIGDIR=	$(PREFIX)/share/dbus-1/system-services
-POLKIT_POLICYDIR=   $(PREFIX)/share/polkit-1/actions
+DBUS_POLICYDIR=		$(SYSCONFDIR)/dbus-1/system.d
+DBUS_CONFIGDIR=		$(PREFIX)/share/dbus-1/system-services
+POLKIT_POLICYDIR=	$(PREFIX)/share/polkit-1/actions
 
 INVOKE_GENFILE_SCRIPT= \
 		./scripts/gen-gdbus-interfaces.sh 
@@ -59,7 +58,6 @@ INVOKE_GENFILE_SCRIPT= \
 all: build
 
 build: _build_interface_objs
-	$(CC) -o bin/out.bin $(CFLAGS) $(GLIBEF) $(SRCDIR)/main.c
 
 clean:
 	find ./bin -type f -exec rm {} \;
@@ -68,17 +66,20 @@ clean:
 install: _install_conf _install_interface_binaries
 
 _build_interface_objs: _build_genfile_objs
-	$(CC) -o bin/systemd-hostnamed $(CFLAGS) $(GLIBEF) $(INTFDIR)/hostnamed/hostnamed.c bin/obj/hostnamed-gen.o 
-	$(CC) -o bin/systemd-localed   $(CFLAGS) $(GLIBEF) $(INTFDIR)/localed/localed.c     bin/obj/localed-gen.o
-	$(CC) -o bin/systemd-timedated $(CFLAGS) $(GLIBEF) $(INTFDIR)/timedated/timedated.c bin/obj/timedated-gen.o
-	$(CC) -o bin/systemd-logind    $(CFLAGS) $(GLIBEF) $(INTFDIR)/logind/logind.c       bin/obj/logind-gen.o
+	$(CC) -o bin/systemd-hostnamed $(CFLAGS) $(GLIBEF) $(INTFDIR)/hostnamed/hostnamed.c bin/obj/hostnamed-gen.o bin/obj/polkit-auth.o 
+	$(CC) -o bin/systemd-localed   $(CFLAGS) $(GLIBEF) $(INTFDIR)/localed/localed.c     bin/obj/localed-gen.o   bin/obj/polkit-auth.o
+	$(CC) -o bin/systemd-timedated $(CFLAGS) $(GLIBEF) $(INTFDIR)/timedated/timedated.c bin/obj/timedated-gen.o bin/obj/polkit-auth.o
+	$(CC) -o bin/systemd-logind    $(CFLAGS) $(GLIBEF) $(INTFDIR)/logind/logind.c       bin/obj/logind-gen.o    bin/obj/polkit-auth.o
 
-_build_genfile_objs: _generate_genfiles
+_build_genfile_objs: _generate_genfiles _build_auth_obj
 	$(CC) -o bin/obj/hostnamed-gen.o $(CFLAGS) $(GLIBOF) -c $(INTFDIR)/hostnamed/hostnamed-gen.c
 	$(CC) -o bin/obj/localed-gen.o   $(CFLAGS) $(GLIBOF) -c $(INTFDIR)/localed/localed-gen.c
 	$(CC) -o bin/obj/timedated-gen.o $(CFLAGS) $(GLIBOF) -c $(INTFDIR)/timedated/timedated-gen.c
 	$(CC) -o bin/obj/logind-gen.o    $(CFLAGS) $(GLIBOF) -c $(INTFDIR)/logind/logind-gen.c
 
+_build_auth_obj:
+	$(CC) -o bin/obj/polkit-auth.o $(CFLAGS) $(GLIBOF) -c $(SRCDIR)/util.c
+
 _generate_genfiles:
 	$(INVOKE_GENFILE_SCRIPT) hostnamed
 	$(INVOKE_GENFILE_SCRIPT) localed
@@ -93,10 +94,10 @@ _generate_servicefiles:
 _install_conf: _generate_servicefiles
 	${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_POLICYDIR)
 	${INSTALL_DATA_DIR} $(DESTDIR)$(DBUS_CONFIGDIR)
-	${INSTALL_DATA_DIR} $(DESTDIR)$(SYSCONFDIR)
+	${INSTALL_DATA_DIR} $(DESTDIR)$(POLKIT_POLICYDIR)
+	${INSTALL_DATA} $(CONFDIR)/machine-info $(DESTDIR)$(SYSCONFDIR)/
 	${INSTALL_DATA} $(POLICYDIR)/*-dbus.conf $(DESTDIR)$(DBUS_POLICYDIR)/
 	${INSTALL_DATA} $(SERVICEFDIR)/*.service $(DESTDIR)$(DBUS_CONFIGDIR)/
-	${INSTALL_DATA} $(CONFDIR)/systemd_compat.conf $(DESTDIR)$(SYSCONFDIR)/
 	${INSTALL_DATA} $(POLKITDIR)/*.policy $(DESTDIR)$(POLKIT_POLICYDIR)/
 
 _install_interface_binaries: $(LINKHN)