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

diff --git a/Makefile b/Makefile
index de3ba75..236fd3c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,29 @@ DEBUGF=-O0 -g
 LINKGN=bin/obj/hostnamed-gen.o bin/obj/localed-gen.o bin/obj/timedated-gen.o bin/obj/logind-gen.o
 LINKHN=bin/systemd-hostnamed bin/systemd-localed bin/systemd-timedated bin/systemd-logind
 
-GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
-GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
+GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
+GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
 
 SANITY=-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 
 PREFIX=/usr/local
+LIBDIR=$(PREFIX)/lib
+OUR_LIBDIR=$(LIBDIR)/systemd-compat
 SYSCONFDIR=/etc
+
 SRCDIR=src
+CONFDIR=conf
+POLICYDIR=$(CONFDIR)/sysbus-policy
+ISPECTDIR=$(CONFDIR)/introspect-xml
+SERVICEFDIR=$(CONFDIR)/service-files
+
 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 +39,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,23 +56,29 @@ _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)/
-	cp conf/systemd_compat.conf       $(SYSCONFDIR)/
+	cp $(POLICYDIR)/*-dbus.conf       $(DBUS_POLICYDIR)/
+	cp $(SERVICEFDIR)/*.service       $(DBUS_CONFIGDIR)/
+	cp $(CONFDIR)/systemd_compat.conf $(SYSCONFDIR)/
 
 _install_interface_binaries: $(LINKHN)
-	mkdir $(PREFIX)/bin/systemd-compat
-	cp bin/systemd-* $(PREFIX)/bin/systemd-compat/
+	mkdir -p $(OUR_LIBDIR)
+	cp bin/systemd-* $(OUR_LIBDIR)/