Move files copied from maildrop to a separate hierarchy.

Signed-off-by: Thomas Schwinge <thomas@schwinge.name>

27 files changed, 43 insertions, 41 deletions

diff --git a/contrib/notmuch-deliver/Makefile.am b/contrib/notmuch-deliver/Makefile.am
index ac9e0fb..365558a 100644
--- a/contrib/notmuch-deliver/Makefile.am
+++ b/contrib/notmuch-deliver/Makefile.am
@@ -3,6 +3,6 @@ MAINTAINERCLEANFILES= Makefile.in configure aclocal.m4 \
 		      config.h config.h.in INSTALL
 ACLOCAL_AMFLAGS= -I m4
 AUTOMAKE_OPTIONS= dist-bzip2 no-dist-gzip std-options foreign
-SUBDIRS= numlib src .
+SUBDIRS= maildrop/numlib src .
 
 doc_DATA= README.mkd
diff --git a/contrib/notmuch-deliver/configure.ac b/contrib/notmuch-deliver/configure.ac
index b6142bc..4deb658 100644
--- a/contrib/notmuch-deliver/configure.ac
+++ b/contrib/notmuch-deliver/configure.ac
@@ -146,10 +146,11 @@ AC_SUBST([NOTMUCH_DELIVER_CFLAGS])
 dnl }}}
 
 dnl {{{ Output
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_LINKS([maildrop/numlib/config.h:config.h])
 AC_OUTPUT(
 		  Makefile
-		  numlib/Makefile
+		  maildrop/numlib/Makefile
 		  src/Makefile
 		  )
 dnl }}}
diff --git a/contrib/notmuch-deliver/src/maildircreate.c b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c
index 74030f4..74030f4 100644
--- a/contrib/notmuch-deliver/src/maildircreate.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c
diff --git a/contrib/notmuch-deliver/src/maildircreate.h b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
index ea1c71a..ea1c71a 100644
--- a/contrib/notmuch-deliver/src/maildircreate.h
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
diff --git a/contrib/notmuch-deliver/src/maildirmisc.h b/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
index 545d11e..545d11e 100644
--- a/contrib/notmuch-deliver/src/maildirmisc.h
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
diff --git a/contrib/notmuch-deliver/src/maildirmkdir.c b/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
index 754b2c7..754b2c7 100644
--- a/contrib/notmuch-deliver/src/maildirmkdir.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
diff --git a/contrib/notmuch-deliver/src/maildiropen.c b/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
index 5071df7..5071df7 100644
--- a/contrib/notmuch-deliver/src/maildiropen.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
diff --git a/contrib/notmuch-deliver/maildrop/numlib/Makefile.am b/contrib/notmuch-deliver/maildrop/numlib/Makefile.am
new file mode 100644
index 0000000..c0f129f
--- /dev/null
+++ b/contrib/notmuch-deliver/maildrop/numlib/Makefile.am
@@ -0,0 +1,27 @@
+# $Id: Makefile.am,v 1.12 2007/06/30 15:40:53 mrsam Exp $
+#
+# Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
+# distribution information.
+
+
+CLEANFILES=$(noinst_DATA)
+noinst_LTLIBRARIES=libnumlib.la
+
+libnumlib_la_SOURCES=\
+	atotimet.c \
+	atouidt.c \
+	changeuidgid.c \
+	numlib.h \
+	strdevt.c \
+	strgidt.c \
+	strhdevt.c \
+	strhinot.c \
+	strhpidt.c \
+	strhtimet.c \
+	strinot.c \
+	strofft.c \
+	strpidt.c \
+	strsize.c \
+	strsizet.c \
+	strtimet.c \
+	struidt.c
diff --git a/contrib/notmuch-deliver/numlib/atotimet.c b/contrib/notmuch-deliver/maildrop/numlib/atotimet.c
index d494fd2..d494fd2 100644
--- a/contrib/notmuch-deliver/numlib/atotimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/atotimet.c
diff --git a/contrib/notmuch-deliver/numlib/atouidt.c b/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
index 3c01ecf..3c01ecf 100644
--- a/contrib/notmuch-deliver/numlib/atouidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
diff --git a/contrib/notmuch-deliver/numlib/changeuidgid.c b/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
index 5679392..5679392 100644
--- a/contrib/notmuch-deliver/numlib/changeuidgid.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
diff --git a/contrib/notmuch-deliver/numlib/numlib.h b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
index 3ed81ee..d356c6d 100644
--- a/contrib/notmuch-deliver/numlib/numlib.h
+++ b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
@@ -12,8 +12,8 @@ extern "C" {
 
 static const char numlib_h_rcsid[]="$Id: numlib.h,v 1.10 2004/01/11 02:47:33 mrsam Exp $";
 
-#ifdef HAVE_CONFIG_H
-#include	"config.h" /* VPATH build */
+#if	HAVE_CONFIG_H
+#include	"../numlib/config.h" /* VPATH build */
 #endif
 
 #include	<sys/types.h>
diff --git a/contrib/notmuch-deliver/numlib/strdevt.c b/contrib/notmuch-deliver/maildrop/numlib/strdevt.c
index 2e542d5..2e542d5 100644
--- a/contrib/notmuch-deliver/numlib/strdevt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strdevt.c
diff --git a/contrib/notmuch-deliver/numlib/strgidt.c b/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
index 89472e3..89472e3 100644
--- a/contrib/notmuch-deliver/numlib/strgidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
diff --git a/contrib/notmuch-deliver/numlib/strhdevt.c b/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
index 98e25e5..98e25e5 100644
--- a/contrib/notmuch-deliver/numlib/strhdevt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
diff --git a/contrib/notmuch-deliver/numlib/strhinot.c b/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
index fa64091..fa64091 100644
--- a/contrib/notmuch-deliver/numlib/strhinot.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
diff --git a/contrib/notmuch-deliver/numlib/strhpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
index 2723af0..2723af0 100644
--- a/contrib/notmuch-deliver/numlib/strhpidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
diff --git a/contrib/notmuch-deliver/numlib/strhtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
index b86b05a..b86b05a 100644
--- a/contrib/notmuch-deliver/numlib/strhtimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
diff --git a/contrib/notmuch-deliver/numlib/strinot.c b/contrib/notmuch-deliver/maildrop/numlib/strinot.c
index eb544c3..eb544c3 100644
--- a/contrib/notmuch-deliver/numlib/strinot.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strinot.c
diff --git a/contrib/notmuch-deliver/numlib/strofft.c b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
index d93edcb..d93edcb 100644
--- a/contrib/notmuch-deliver/numlib/strofft.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
diff --git a/contrib/notmuch-deliver/numlib/strpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
index 12ee9ce..12ee9ce 100644
--- a/contrib/notmuch-deliver/numlib/strpidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
diff --git a/contrib/notmuch-deliver/numlib/strsize.c b/contrib/notmuch-deliver/maildrop/numlib/strsize.c
index 0a7dcaa..0a7dcaa 100644
--- a/contrib/notmuch-deliver/numlib/strsize.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strsize.c
diff --git a/contrib/notmuch-deliver/numlib/strsizet.c b/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
index d4ec92d..d4ec92d 100644
--- a/contrib/notmuch-deliver/numlib/strsizet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
diff --git a/contrib/notmuch-deliver/numlib/strtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
index be7e051..be7e051 100644
--- a/contrib/notmuch-deliver/numlib/strtimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
diff --git a/contrib/notmuch-deliver/numlib/struidt.c b/contrib/notmuch-deliver/maildrop/numlib/struidt.c
index 50f3f74..50f3f74 100644
--- a/contrib/notmuch-deliver/numlib/struidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/struidt.c
diff --git a/contrib/notmuch-deliver/numlib/Makefile.am b/contrib/notmuch-deliver/numlib/Makefile.am
deleted file mode 100644
index 3d0c2b2..0000000
--- a/contrib/notmuch-deliver/numlib/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: Makefile.am,v 1.12 2007/06/30 15:40:53 mrsam Exp $
-#
-# Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
-# distribution information.
-
-
-CLEANFILES=$(noinst_DATA)
-noinst_LTLIBRARIES=\
-		   libnumlib.la
-
-noinst_HEADERS=\
-	       numlib.h
-libnumlib_la_SOURCES=\
-		     atotimet.c \
-		     atouidt.c \
-		     changeuidgid.c \
-		     strdevt.c \
-		     strgidt.c \
-		     strhdevt.c \
-		     strhinot.c \
-		     strhpidt.c \
-		     strhtimet.c \
-		     strinot.c \
-		     strofft.c \
-		     strpidt.c \
-		     strsize.c \
-		     strsizet.c \
-		     strtimet.c \
-		     struidt.c
diff --git a/contrib/notmuch-deliver/src/Makefile.am b/contrib/notmuch-deliver/src/Makefile.am
index fbb29ab..e2ff7ba 100644
--- a/contrib/notmuch-deliver/src/Makefile.am
+++ b/contrib/notmuch-deliver/src/Makefile.am
@@ -1,19 +1,22 @@
 DEFS+= -DGITHEAD=\"$(GITHEAD)\"
-AM_CPPFLAGS= -I$(top_srcdir)
+AM_CPPFLAGS= \
+  -I$(top_builddir)/maildrop/numlib \
+  -I$(top_srcdir)/maildrop \
+  -I$(top_srcdir)/maildrop/maildir
 AM_CFLAGS= @NOTMUCH_DELIVER_CFLAGS@ $(glib_CFLAGS)
 
 noinst_HEADERS=\
-	       maildircreate.h \
-	       maildirmisc.h
+	       $(top_srcdir)/maildrop/maildir/maildircreate.h \
+	       $(top_srcdir)/maildrop/maildir/maildirmisc.h
 
 bin_PROGRAMS=\
 	     notmuch-deliver
 
 notmuch_deliver_SOURCES=\
-			maildircreate.c \
-			maildiropen.c \
-			maildirmkdir.c \
+			$(top_srcdir)/maildrop/maildir/maildircreate.c \
+			$(top_srcdir)/maildrop/maildir/maildiropen.c \
+			$(top_srcdir)/maildrop/maildir/maildirmkdir.c \
 			main.c
 notmuch_deliver_LDADD=\
-		      $(top_builddir)/numlib/libnumlib.la \
+		      $(top_builddir)/maildrop/numlib/libnumlib.la \
 		      $(glib_LIBS)