nonrecbuild: Fix rpcif* generation rules

2 files changed, 44 insertions, 37 deletions

diff --git a/clientcomm/Makefile-files b/clientcomm/Makefile-files
index 322d62e..67f2961 100644
--- a/clientcomm/Makefile-files
+++ b/clientcomm/Makefile-files
@@ -31,7 +31,9 @@
 
 pkglib_LTLIBRARIES += libclientcomm.la
 
-nodist_libclientcomm_la_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h
+nodist_libclientcomm_la_SOURCES  = clientcomm/rpcif_clnt.cc
+nodist_libclientcomm_la_SOURCES += clientcomm/rpcif_xdr.c
+nodist_libclientcomm_la_SOURCES += clientcomm/rpcif.h
 libclientcomm_la_SOURCES = clientcomm.cc clientcomm.hh rpcclientcomm.cc \
                           rpcclientcomm.hh clientcomm.icc \
                           ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h \
@@ -49,43 +51,48 @@ libclientcomm_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libclientcomm_la_CPPFLAGS += -I$(top_srcdir)/rnprotocol
 libclientcomm_la_CPPFLAGS += $(CLIENT_CPPFLAGS)
 
-EXTRA_libclientcomm_la_SOURCES = rpcif.x
+EXTRA_libclientcomm_la_SOURCES = clientcomm/rpcif.x
 
-BUILT_SOURCES += rpcif.h
-CLEANFILES += rpcif.h rpcif.h.tmp rpcif.h.tmp2
-EXTRA_DIST += rpcif.h.awk
-rpcif.h: rpcif.x rpcif.h.awk Makefile
-	$(RPCGEN) -h -o rpcif.h.tmp $(srcdir)/rpcif.x
-	$(AWK) -f $(srcdir)/rpcif.h.awk rpcif.h.tmp > rpcif.h.tmp2
-	$(SED) 's,_RPCIF\.H_H_RPCGEN,_RPCIF_H_H_RPCGEN,g' rpcif.h.tmp2 > rpcif.h
-	rm rpcif.h.tmp rpcif.h.tmp2
+BUILT_SOURCES += clientcomm/rpcif.h
+CLEANFILES += clientcomm/rpcif.h clientcomm/rpcif.h.tmp clientcomm/rpcif.h.tmp2
+EXTRA_DIST += clientcomm/rpcif.h.awk
+clientcomm/rpcif.h: clientcomm/rpcif.x clientcomm/rpcif.h.awk Makefile
+	$(MKDIR_P) clientcomm
+	$(RPCGEN) -h -o clientcomm/rpcif.h.tmp $(srcdir)/clientcomm/rpcif.x
+	$(AWK) -f $(srcdir)/clientcomm/rpcif.h.awk clientcomm/rpcif.h.tmp > clientcomm/rpcif.h.tmp2
+	$(SED) 's,_RPCIF\.H_H_RPCGEN,_RPCIF_H_H_RPCGEN,g' clientcomm/rpcif.h.tmp2 > clientcomm/rpcif.h
+	rm clientcomm/rpcif.h.tmp clientcomm/rpcif.h.tmp2
 
 FIX_RPCIF_H_INCLUDE  = $(SED)
 FIX_RPCIF_H_INCLUDE += 's,^\#include ".*/clientcomm/rpcif.h"$$,\#include "clientcomm/rpcif.h",'
 
-BUILT_SOURCES += rpcif_clnt.cc
-CLEANFILES += rpcif_clnt.cc rpcif_clnt.c.tmp rpcif_clnt.c.tmp2
-EXTRA_DIST += rpcif_clnt.c.awk
-rpcif_clnt.cc: rpcif.x rpcif_clnt.c.awk Makefile
-	-rm rpcif_clnt.cc.tmp
-	$(RPCGEN) -l -o rpcif_clnt.cc.tmp $(srcdir)/rpcif.x
-	$(AWK) -f $(srcdir)/rpcif_clnt.c.awk rpcif_clnt.cc.tmp > rpcif_clnt.cc.tmp2
-	$(FIX_RPCIF_H_INCLUDE) rpcif_clnt.cc.tmp2 > rpcif_clnt.cc
-	rm rpcif_clnt.cc.tmp rpcif_clnt.cc.tmp2
+BUILT_SOURCES += clientcomm/rpcif_clnt.cc
+CLEANFILES += clientcomm/rpcif_clnt.cc clientcomm/rpcif_clnt.c.tmp clientcomm/rpcif_clnt.c.tmp2
+EXTRA_DIST += clientcomm/rpcif_clnt.c.awk
+clientcomm/rpcif_clnt.cc: clientcomm/rpcif.x clientcomm/rpcif_clnt.c.awk Makefile
+	rm -f clientcomm/rpcif_clnt.cc.tmp
+	$(MKDIR_P) clientcomm
+	$(RPCGEN) -l -o clientcomm/rpcif_clnt.cc.tmp $(srcdir)/clientcomm/rpcif.x
+	$(AWK) -f $(srcdir)/clientcomm/rpcif_clnt.c.awk clientcomm/rpcif_clnt.cc.tmp > clientcomm/rpcif_clnt.cc.tmp2
+	$(FIX_RPCIF_H_INCLUDE) clientcomm/rpcif_clnt.cc.tmp2 > clientcomm/rpcif_clnt.cc
+	rm clientcomm/rpcif_clnt.cc.tmp clientcomm/rpcif_clnt.cc.tmp2
 
-BUILT_SOURCES += rpcif_xdr.c
-CLEANFILES += rpcif_xdr.c rpcif_xdr.c.tmp
-rpcif_xdr.c: rpcif.x Makefile
-	-rm rpcif_xdr.c.tmp
-	$(RPCGEN) -c -o rpcif_xdr.c.tmp $(srcdir)/rpcif.x
-	$(FIX_RPCIF_H_INCLUDE) rpcif_xdr.c.tmp > rpcif_xdr.c
-	rm rpcif_xdr.c.tmp
+BUILT_SOURCES += clientcomm/rpcif_xdr.c
+CLEANFILES += clientcomm/rpcif_xdr.c clientcomm/rpcif_xdr.c.tmp
+clientcomm/rpcif_xdr.c: clientcomm/rpcif.x Makefile
+	rm -f clientcomm/rpcif_xdr.c.tmp
+	$(MKDIR_P) clientcomm
+	$(RPCGEN) -c -o clientcomm/rpcif_xdr.c.tmp $(srcdir)/clientcomm/rpcif.x
+	$(FIX_RPCIF_H_INCLUDE) clientcomm/rpcif_xdr.c.tmp > clientcomm/rpcif_xdr.c
+	rm clientcomm/rpcif_xdr.c.tmp
 
-BUILT_SOURCES += rpcif_svc.cc
-CLEANFILES += rpcif_svc.cc rpcif_svc.cc.tmp rpcif_svc.cc.tmp2
-EXTRA_DIST += rpcif_svc.c.awk
-rpcif_svc.cc: rpcif.x rpcif_svc.c.awk Makefile
-	$(RPCGEN) -m -o rpcif_svc.cc.tmp $(srcdir)/rpcif.x
-	$(AWK) -f $(srcdir)/rpcif_svc.c.awk rpcif_svc.cc.tmp > rpcif_svc.cc.tmp2
-	$(FIX_RPCIF_H_INCLUDE) rpcif_svc.cc.tmp2 > rpcif_svc.cc
-	rm rpcif_svc.cc.tmp rpcif_svc.cc.tmp2
+BUILT_SOURCES += clientcomm/rpcif_svc.cc
+CLEANFILES += clientcomm/rpcif_svc.cc clientcomm/rpcif_svc.cc.tmp clientcomm/rpcif_svc.cc.tmp2
+EXTRA_DIST += clientcomm/rpcif_svc.c.awk
+clientcomm/rpcif_svc.cc: clientcomm/rpcif.x clientcomm/rpcif_svc.c.awk Makefile
+	rm -f clientcomm/rpcif_svc.cc.tmp
+	$(MKDIR_P) clientcomm
+	$(RPCGEN) -m -o clientcomm/rpcif_svc.cc.tmp $(srcdir)/clientcomm/rpcif.x
+	$(AWK) -f $(srcdir)/clientcomm/rpcif_svc.c.awk clientcomm/rpcif_svc.cc.tmp > clientcomm/rpcif_svc.cc.tmp2
+	$(FIX_RPCIF_H_INCLUDE) clientcomm/rpcif_svc.cc.tmp2 > clientcomm/rpcif_svc.cc
+	rm clientcomm/rpcif_svc.cc.tmp clientcomm/rpcif_svc.cc.tmp2
diff --git a/servercomm/Makefile-files b/servercomm/Makefile-files
index b1a4bac..bdb01e4 100644
--- a/servercomm/Makefile-files
+++ b/servercomm/Makefile-files
@@ -30,9 +30,9 @@
 
 pkglib_LTLIBRARIES += libservercomm.la
 
-nodist_libservercomm_la_SOURCES  = ../clientcomm/rpcif_xdr.c
-nodist_libservercomm_la_SOURCES += ../clientcomm/rpcif_svc.cc
-nodist_libservercomm_la_SOURCES += ../clientcomm/rpcif.h
+nodist_libservercomm_la_SOURCES  = clientcomm/rpcif_xdr.c
+nodist_libservercomm_la_SOURCES += clientcomm/rpcif_svc.cc
+nodist_libservercomm_la_SOURCES += clientcomm/rpcif.h
 libservercomm_la_SOURCES=servercomm.cc \
                         servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \
                         ../mymalloc/mymalloc_svc.cc ../mymalloc/mymalloc.h \