X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=Makefile;h=b80240374cee4930253d07e96a2f3d72c9a3e305;hp=de3ba75521b68eb1829d19dad77681e91c1ecba4;hb=9ce456700bab1a39ee3aa7f95bd7a2f9505d91ec;hpb=b63d30e3b9cceb0a33045bec2050f5d2598fe583

diff --git a/Makefile b/Makefile
index de3ba75..b802403 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,11 @@ SYSCONFDIR=/etc
 SRCDIR=src
 INTFDIR=$(SRCDIR)/interfaces
 
-DBUS_POLICYDIR=$(SYSCONFDIR)/dbus-1/systemd.d
+DBUS_POLICYDIR=$(SYSCONFDIR)/dbus-1/system.d
 DBUS_CONFIGDIR=$(PREFIX)/share/dbus-1/system-services
 
+INVOKE_GENFILE_SCRIPT=./scripts/gen-gdbus-interfaces.sh 
+
 all: build
 
 build: _build_interface_objs_debug 
@@ -29,8 +31,8 @@ publish: _build_interface_objs
 	$(CC) -o bin/out.bin $(CFLAGS) $(GLIBEF) $(SANITY) $(SRCDIR)/main.c
 
 clean:
-	rm bin/*
-	rm bin/obj/*
+	find ./bin -type f -exec rm {} \;
+	find $(INTFDIR)/ -type f -iname *-gen.* -exec rm {} \;
 
 install: _install_conf _install_interface_binaries
 
@@ -46,18 +48,24 @@ _build_interface_objs_debug: _build_genfile_objs_debug
 	$(CC) -o bin/systemd-timedated $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/timedated/timedated.c bin/obj/timedated-gen.o
 	$(CC) -o bin/systemd-logind    $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/logind/logind.c       bin/obj/logind-gen.o
 
-_build_genfile_objs:
+_build_genfile_objs: _generate_genfiles
 	$(CC) -o bin/obj/hostnamed-gen.o $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/hostnamed/hostnamed-gen.c
 	$(CC) -o bin/obj/localed-gen.o   $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/localed/localed-gen.c
 	$(CC) -o bin/obj/timedated-gen.o $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/timedated/timedated-gen.c
 	$(CC) -o bin/obj/logind-gen.o    $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/logind/logind-gen.c
 
-_build_genfile_objs_debug:
+_build_genfile_objs_debug: _generate_genfiles
 	$(CC) -o bin/obj/hostnamed-gen.o $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/hostnamed/hostnamed-gen.c
 	$(CC) -o bin/obj/localed-gen.o   $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/localed/localed-gen.c
 	$(CC) -o bin/obj/timedated-gen.o $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/timedated/timedated-gen.c
 	$(CC) -o bin/obj/logind-gen.o    $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/logind/logind-gen.c
 
+_generate_genfiles:
+	$(INVOKE_GENFILE_SCRIPT) hostnamed
+	$(INVOKE_GENFILE_SCRIPT) localed
+	$(INVOKE_GENFILE_SCRIPT) timedated
+	$(INVOKE_GENFILE_SCRIPT) logind
+
 _install_conf:
 	cp conf/*-dbus.conf               $(DBUS_POLICYDIR)/
 	cp conf/org.freedesktop.*.service $(DBUS_CONFIGDIR)/