Move files copied from maildrop to a separate hierarchy.

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

diff --git a/contrib/notmuch-deliver/Makefile.am b/contrib/notmuch-deliver/Makefile.am
index ac9e0fbc3ab7c63853d50fea7d295d03f4b28754..365558ab96c9957a85733c7496e4ee84b1468142 100644 (file)
--- 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 b6142bcec30a28a459b307c1c4018735e4886b3f..4deb6587b5649dbae9e6772d6104b4bc631244e5 100644 (file)
--- 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
similarity index 100%
rename from contrib/notmuch-deliver/src/maildircreate.c
rename to contrib/notmuch-deliver/maildrop/maildir/maildircreate.c

diff --git a/contrib/notmuch-deliver/src/maildircreate.h b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
similarity index 100%
rename from contrib/notmuch-deliver/src/maildircreate.h
rename to contrib/notmuch-deliver/maildrop/maildir/maildircreate.h

diff --git a/contrib/notmuch-deliver/src/maildirmisc.h b/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
similarity index 100%
rename from contrib/notmuch-deliver/src/maildirmisc.h
rename to contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h

diff --git a/contrib/notmuch-deliver/src/maildirmkdir.c b/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
similarity index 100%
rename from contrib/notmuch-deliver/src/maildirmkdir.c
rename to contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c

diff --git a/contrib/notmuch-deliver/src/maildiropen.c b/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
similarity index 100%
rename from contrib/notmuch-deliver/src/maildiropen.c
rename to 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 (file)
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
similarity index 100%
rename from contrib/notmuch-deliver/numlib/atotimet.c
rename to contrib/notmuch-deliver/maildrop/numlib/atotimet.c

diff --git a/contrib/notmuch-deliver/numlib/atouidt.c b/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/atouidt.c
rename to contrib/notmuch-deliver/maildrop/numlib/atouidt.c

diff --git a/contrib/notmuch-deliver/numlib/changeuidgid.c b/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/changeuidgid.c
rename to contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c

diff --git a/contrib/notmuch-deliver/numlib/numlib.h b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
similarity index 97%
rename from contrib/notmuch-deliver/numlib/numlib.h
rename to contrib/notmuch-deliver/maildrop/numlib/numlib.h
index 3ed81ee48a10b8cc649a096ad58b6b33696cbb30..d356c6d3f9f7600d19e7f01398955ffa51d85f2e 100644 (file)
--- 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
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strdevt.c
rename to contrib/notmuch-deliver/maildrop/numlib/strdevt.c

diff --git a/contrib/notmuch-deliver/numlib/strgidt.c b/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strgidt.c
rename to contrib/notmuch-deliver/maildrop/numlib/strgidt.c

diff --git a/contrib/notmuch-deliver/numlib/strhdevt.c b/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strhdevt.c
rename to contrib/notmuch-deliver/maildrop/numlib/strhdevt.c

diff --git a/contrib/notmuch-deliver/numlib/strhinot.c b/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strhinot.c
rename to contrib/notmuch-deliver/maildrop/numlib/strhinot.c

diff --git a/contrib/notmuch-deliver/numlib/strhpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strhpidt.c
rename to contrib/notmuch-deliver/maildrop/numlib/strhpidt.c

diff --git a/contrib/notmuch-deliver/numlib/strhtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strhtimet.c
rename to contrib/notmuch-deliver/maildrop/numlib/strhtimet.c

diff --git a/contrib/notmuch-deliver/numlib/strinot.c b/contrib/notmuch-deliver/maildrop/numlib/strinot.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strinot.c
rename to contrib/notmuch-deliver/maildrop/numlib/strinot.c

diff --git a/contrib/notmuch-deliver/numlib/strofft.c b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strofft.c
rename to contrib/notmuch-deliver/maildrop/numlib/strofft.c

diff --git a/contrib/notmuch-deliver/numlib/strpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strpidt.c
rename to contrib/notmuch-deliver/maildrop/numlib/strpidt.c

diff --git a/contrib/notmuch-deliver/numlib/strsize.c b/contrib/notmuch-deliver/maildrop/numlib/strsize.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strsize.c
rename to contrib/notmuch-deliver/maildrop/numlib/strsize.c

diff --git a/contrib/notmuch-deliver/numlib/strsizet.c b/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strsizet.c
rename to contrib/notmuch-deliver/maildrop/numlib/strsizet.c

diff --git a/contrib/notmuch-deliver/numlib/strtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/strtimet.c
rename to contrib/notmuch-deliver/maildrop/numlib/strtimet.c

diff --git a/contrib/notmuch-deliver/numlib/struidt.c b/contrib/notmuch-deliver/maildrop/numlib/struidt.c
similarity index 100%
rename from contrib/notmuch-deliver/numlib/struidt.c
rename to 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 (file)
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 fbb29ab24f9792581c11c997bdcd5d74a6470fdd..e2ff7baa0800771aa3bee6552365a7e4d51b370f 100644 (file)
--- 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)