From ab162bbc99555ea6d3a27663213eda444ec95967 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Thu, 28 Mar 2013 15:37:19 +1030
Subject: [PATCH] Fix Makefile broken by recent version string changes

---
 Makefile.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 725e4da8..23020d4c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,11 +82,13 @@ $(MDPCLIENTOBJS): $(HDRS)
 
 servald:	$(OBJS)
 	@echo LINK $@
-	@v=`./version_string.sh` && $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(OBJS) $(LDFLAGS)
+	@v=`./version_string.sh` \
+            && $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(OBJS) $(LDFLAGS)
 
 directory_service: $(MDPCLIENTOBJS) directory_service.o
 	@echo LINK $@
-	@v=`./version_string.sh` && $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(MDPCLIENTOBJS) directory_service.o $(LDFLAGS)
+	@v=`./version_string.sh` \
+            && $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(MDPCLIENTOBJS) directory_service.o $(LDFLAGS)
 
 tfw_createfile: tfw_createfile.o str.o strbuf.o strbuf_helpers.o
 	@echo LINK $@
@@ -96,15 +98,18 @@ tfw_createfile: tfw_createfile.o str.o strbuf.o strbuf_helpers.o
 # DOC 20120615
 libservald.so: $(OBJS)
 	@echo LINK $@
-	@$(CC) $(CFLAGS) -Wall -shared -o $@ $(OBJS) $(LDFLAGS)
+	@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_servald.o -c version_servald.c
+	@$(CC) $(CFLAGS) -Wall -shared -o $@ $(OBJS) version_servald.o $(LDFLAGS)
 
 libmonitorclient.so: $(MONITORCLIENTOBJS)
 	@echo LINK $@
-	@$(CC) $(CFLAGS) -Wall -shared -o $@ $(MONITORCLIENTOBJS) $(LDFLAGS)
+	@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_libmonitorclient.o -c version_servald.c
+	@$(CC) $(CFLAGS) -Wall -shared -o $@ $(MONITORCLIENTOBJS) version_libmonitorclient.o $(LDFLAGS)
 
 libmonitorclient.a: $(MONITORCLIENTOBJS)
 	@echo AR $@
-	@$(AR) -cr $@ $(MONITORCLIENTOBJS)
+	@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_libmonitorclient.o -c version_servald.c
+	@$(AR) -cr $@ $(MONITORCLIENTOBJS) version_libmonitorclient.o
 
 clean:
-	@rm -f $(OBJS) servald libservald.so libmonitorclient.so libmonitorclient.a
+	@rm -f $(OBJS) servald libservald.so libmonitorclient.so version_libmonitorclient.o libmonitorclient.a