Convert "daemon" mode of C client code to use Python RPC MUX.

1 files changed, 3 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index c0a136b..1e7316a 100644
--- a/Makefile
+++ b/Makefile
@@ -144,16 +144,12 @@ endif
 # the C preprocessor: we can use symbolic names so long as they're defined as macros
 # in the C code, but we can't use things like C enum symbols.
 
-ifneq "${RPC_MODE}" "server"
-  OBJ += rpc_serial.o
-endif
-
 RPC_CLIENT_OBJ = rpc_client.o
 
 ifeq "${RPC_TRANSPORT}" "loopback"
   RPC_CLIENT_OBJ += rpc_client_loopback.o
 else ifeq "${RPC_TRANSPORT}" "serial"
-  RPC_CLIENT_OBJ += rpc_client_serial.o
+  RPC_CLIENT_OBJ += rpc_serial.o rpc_client_serial.o
 else ifeq "${RPC_TRANSPORT}" "daemon"
   RPC_CLIENT_OBJ += rpc_client_daemon.o
 endif
@@ -225,13 +221,10 @@ server:
 serial:
 	${MAKE} RPC_MODE=client-mixed RPC_TRANSPORT=serial
 
-daemon: mixed cryptech_rpcd
+daemon: mixed
 
 .PHONY: client mixed server serial daemon
 
-cryptech_rpcd: daemon.o ${LIB}
-	${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS}
-
 ${OBJ}: ${INC}
 
 ${LIB}: ${OBJ}
@@ -251,7 +244,7 @@ test: all
 	cd tests; ${MAKE} -k $@
 
 clean:
-	rm -f *.o ${LIB} cryptech_rpcd
+	rm -f *.o ${LIB}
 	cd tests; ${MAKE} $@
 	cd utils; ${MAKE} $@