revamp makefile, build and link objects instead of #include'ing them

previously main.c #include'd files which themselves #include'd all source
files. now, we (correctly) build objects from the genfile, which are linked
to our sources.

diff --git a/Makefile b/Makefile
index 084a948f9f8c64ed447b94d8cefd000526526684..011a12ca822a94cc1186f489173095cf3ef1086a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,35 +5,56 @@ DEBUGF=-O0 -g
 SRCDIR=src
 INTFDIR=$(SRCDIR)/interfaces
 SANITY=-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
+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
 
-GLIBF=`pkg-config --cflags --libs 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`
+GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
 
 all: build
 
-build:
-       gcc -o bin/out.bin $(DEBUGF) $(GLIBF) $(SANITY) $(SRCDIR)/main.c 
+build: _build_interface_objs_debug
+       gcc -o bin/out.bin $(DEBUGF) $(GLIBEF) $(SANITY) $(SRCDIR)/main.c
 
-build-interface-binaries:
-       gcc -o bin/systemd-hostnamed-handler $(DEBUGF) $(GLIBF) $(SANITY) -D COMPILE_HOSTNAMED_BINARY $(SRCDIR)/main.c
-       gcc -o bin/systemd-localed-handler $(DEBUGF) $(GLIBF) $(SANITY) -D COMPILE_LOCALED_BINARY $(SRCDIR)/main.c
-       gcc -o bin/systemd-timedated-handler $(DEBUGF) $(GLIBF) $(SANITY) -D COMPILE_TIMEDATED_BINARY $(SRCDIR)/main.c
-       gcc -o bin/systemd-logind-handler $(DEBUGF) $(GLIBF) $(SANITY) -D COMPILE_LOGIND_BINARY $(SRCDIR)/main.c
-
-publish:
-       gcc -o bin/out.bin $(CFLAGS) $(GLIBF) $(SANITY) $(SRCDIR)/main.c
+publish: _build_interface_objs
+       gcc -o bin/out.bin $(CFLAGS) $(GLIBEF) $(SANITY) $(SRCDIR)/main.c
 
 clean:
        rm bin/*
 
 install: _install_conf _install_interface_binaries
 
+_build_interface_objs: _build_genfile_objs
+       gcc -o bin/systemd-hostnamed $(CFLAGS) $(GLIBEF) $(SANITY) $(INTFDIR)/hostnamed/hostnamed.c bin/obj/hostnamed-gen.o 
+       gcc -o bin/systemd-localed   $(CFLAGS) $(GLIBEF) $(SANITY) $(INTFDIR)/localed/localed.c     bin/obj/localed-gen.o
+       gcc -o bin/systemd-timedated $(CFLAGS) $(GLIBEF) $(SANITY) $(INTFDIR)/timedated/timedated.c bin/obj/timedated-gen.o
+       gcc -o bin/systemd-logind    $(CFLAGS) $(GLIBEF) $(SANITY) $(INTFDIR)/logind/logind.c       bin/obj/logind-gen.o
+
+_build_interface_objs_debug: _build_genfile_objs_debug
+       gcc -o bin/systemd-hostnamed $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/hostnamed/hostnamed.c bin/obj/hostnamed-gen.o  
+       gcc -o bin/systemd-localed   $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/localed/localed.c     bin/obj/localed-gen.o
+       gcc -o bin/systemd-timedated $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/timedated/timedated.c bin/obj/timedated-gen.o
+       gcc -o bin/systemd-logind    $(DEBUGF) $(GLIBEF) $(SANITY) $(INTFDIR)/logind/logind.c       bin/obj/logind-gen.o
+
+_build_genfile_objs:
+       gcc -o bin/obj/hostnamed-gen.o $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/hostnamed/hostnamed-gen.c
+       gcc -o bin/obj/localed-gen.o   $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/localed/localed-gen.c
+       gcc -o bin/obj/timedated-gen.o $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/timedated/timedated-gen.c
+       gcc -o bin/obj/logind-gen.o    $(CFLAGS) $(GLIBOF) $(SANITY) -c $(INTFDIR)/logind/logind-gen.c
+
+_build_genfile_objs_debug:
+       gcc -o bin/obj/hostnamed-gen.o $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/hostnamed/hostnamed-gen.c
+       gcc -o bin/obj/localed-gen.o   $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/localed/localed-gen.c
+       gcc -o bin/obj/timedated-gen.o $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/timedated/timedated-gen.c
+       gcc -o bin/obj/logind-gen.o    $(DEBUGF) $(GLIBOF) $(SANITY) -c $(INTFDIR)/logind/logind-gen.c
+
 _install_conf:
-       cp conf/*-dbus.conf /etc/dbus-1/system.d/
+       cp conf/*-dbus.conf         /etc/dbus-1/system.d/
        cp conf/systemd_compat.conf /etc/
 
-_install_interface_binaries:
-       cp bin/systemd-hostnamed-handler /usr/local/libexec/
-       cp bin/systemd-localed-handler /usr/local/libexec/
-       cp bin/systemd-timedated-handler /usr/local/libexec/
-       cp bin/systemd-logind-handler /usr/local/libexec/
+_install_interface_binaries: $(LINKHN)
+       cp bin/systemd-hostnamed /usr/local/libexec/
+       cp bin/systemd-localed   /usr/local/libexec/
+       cp bin/systemd-timedated /usr/local/libexec/
+       cp bin/systemd-logind    /usr/local/libexec/