dovecot: Yet another try at getting rquota code compiling proper...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/b951f3e42322
changeset: 6439:b951f3e42322
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 18 18:14:29 2007 +0300
description:
Yet another try at getting rquota code compiling properly with BSD make.

diffstat:

2 files changed, 20 insertions(+), 14 deletions(-)
src/plugins/quota/Makefile.am |   32 +++++++++++++++++++-------------
src/plugins/quota/quota-fs.c  |    2 +-

diffs (68 lines):

diff -r 2ab3cb6af745 -r b951f3e42322 src/plugins/quota/Makefile.am
--- a/src/plugins/quota/Makefile.am	Mon Sep 17 15:57:11 2007 +0300
+++ b/src/plugins/quota/Makefile.am	Tue Sep 18 18:14:29 2007 +0300
@@ -17,7 +17,7 @@ lib10_quota_plugin_la_LIBADD = \
 	-lrpcsvc
 endif
 
-lib10_quota_plugin_la_SOURCES = \
+quota_dist_sources = \
 	quota.c \
 	quota-count.c \
 	quota-fs.c \
@@ -27,19 +27,23 @@ lib10_quota_plugin_la_SOURCES = \
         quota-plugin.c \
 	quota-storage.c
 
+lib10_quota_plugin_la_SOURCES = \
+	$(quota_dist_sources) \
+	$(RQUOTA_XDR)
+
 if HAVE_RQUOTA
-lib10_quota_plugin_la_DEPENDENCIES = \
-	rquota_xdr.c
+RQUOTA_XDR = rquota_xdr.c
+RQUOTA_X = /usr/include/rpcsvc/rquota.x
+rquota_xdr.c: Makefile $(RQUOTA_X)
+	(printf '#include "lib.h"'; $(RPCGEN) -c $(RQUOTA_X) | \
+	  sed -e 's/IXDR_PUT/(void)IXDR_PUT/g' \
+	    -e 's/int32_t \*buf/int32_t *buf ATTR_UNUSED/' ) > rquota_xdr.c
 
-RQUOTA_X = /usr/include/rpcsvc/rquota.x
-rquota_xdr.c: Makefile rquota.h $(RQUOTA_X)
-	$(RPCGEN) -c $(RQUOTA_X) | \
-	  sed -e 's/IXDR_PUT/(void)IXDR_PUT/g' \
-	    -e 's/int32_t \*buf/int32_t *buf ATTR_UNUSED/' > rquota_xdr.c
+rquota.h: Makefile $(RQUOTA_X)
+	$(RPCGEN) -h $(RQUOTA_X) > rquota.h
 
-# BSD rpcgen wants to include the .h from current directory, so generate it
-rquota.h:
-	$(RPCGEN) -h $(RQUOTA_X) > rquota.h
+quota-fs.lo: rquota.h
+
 endif
 
 noinst_HEADERS = \
@@ -55,5 +59,7 @@ install-exec-local:
 	  $(LN_S) ../lib10_quota_plugin.so $(DESTDIR)$(moduledir)/$$d; \
 	done
 
-distclean-generic:
-	rm -f Makefile rquota_xdr.c
+DISTFILES = $(DIST_COMMON) $(quota_dist_sources) $(TEXINFOS) $(EXTRA_DIST)
+
+clean-generic:
+	rm -f rquota_xdr.c rquota.h
diff -r 2ab3cb6af745 -r b951f3e42322 src/plugins/quota/quota-fs.c
--- a/src/plugins/quota/quota-fs.c	Mon Sep 17 15:57:11 2007 +0300
+++ b/src/plugins/quota/quota-fs.c	Tue Sep 18 18:14:29 2007 +0300
@@ -25,7 +25,7 @@
 #endif
 
 #ifdef HAVE_RQUOTA
-#  include "rquota_xdr.c"
+#  include "rquota.h"
 #  define RQUOTA_GETQUOTA_TIMEOUT_SECS 10
 #endif