From: Richard Russon <rich@flatcap.org>
Date: Wed, 22 Nov 2017 00:48:48 +0000 (+0000)
Subject: fix out-of-tree builds
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d60e3cdc1066a166194a6de82948800f976fbd0;p=neomutt

fix out-of-tree builds
---

diff --git a/Makefile.am b/Makefile.am
index c49ec5c0f..d4aba214a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,13 +77,13 @@ neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) $(LIBCONNDE
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\"
 
-AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
+AM_CPPFLAGS=-I. -I.. -I$(top_srcdir) $(GPGME_CFLAGS)
 
 EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
 	mutt_lua.c mutt_notmuch.c \
 	remailer.c remailer.h resize.c url.h
 
-EXTRA_DIST = account.h attach.h bcache.h browser.h buffy.h \
+EXTRA_DIST = mutt_account.h attach.h bcache.h browser.h buffy.h \
 	ChangeLog.md charset.h CODE_OF_CONDUCT.md compress.h copy.h \
 	COPYRIGHT filter.h functions.h globals.h \
 	group.h history.h init.h keymap.h LICENSE.md mailbox.h \
diff --git a/Makefile.autosetup b/Makefile.autosetup
index 5c4050546..65d6f2a23 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -216,11 +216,11 @@ $(NEOMUTT): $(GENERATED) $(NEOMUTTOBJS) $(MUTTLIBS)
 	$(CC) -o $@ $(NEOMUTTOBJS) $(MUTTLIBS) $(LDFLAGS) $(LIBS)
 
 # libmutt
-$(LIBMUTT): $(PWD)/lib $(LIBMUTTOBJS)
+$(LIBMUTT): $(PWD)/mutt $(LIBMUTTOBJS)
 	$(AR) cr $@ $(LIBMUTTOBJS)
 	$(RANLIB) $@
-$(PWD)/lib:
-	$(MKDIR_P) $(PWD)/lib
+$(PWD)/mutt:
+	$(MKDIR_P) $(PWD)/mutt
 
 # libncrypt
 $(LIBNCRYPT): $(PWD)/ncrypt $(LIBNCRYPTOBJS)
diff --git a/conn/Makefile.am b/conn/Makefile.am
index 46cf6d60d..d031b5c5b 100644
--- a/conn/Makefile.am
+++ b/conn/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/flymake.am
 
 AUTOMAKE_OPTIONS = 1.6 foreign
 
-EXTRA_DIST = account.h connection.h sasl.h sasl_plain.h socket.h ssl.h tunnel.h
+EXTRA_DIST = conn.h conn_globals.h account.h connection.h sasl.h sasl_plain.h socket.h ssl.h tunnel.h
 
 AM_CPPFLAGS = -I$(top_srcdir)
 
diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup
index 7c8df88a1..b34cae0e5 100644
--- a/doc/Makefile.autosetup
+++ b/doc/Makefile.autosetup
@@ -1,7 +1,7 @@
 MAKEDOC_CPP = $(CC_FOR_BUILD) -D_MAKEDOC -E -C -I.
 
-doc/makedoc$(EXEEXT): doc/makedoc.c
-	$(CC_FOR_BUILD) -I. -o $@ doc/makedoc.c
+doc/makedoc$(EXEEXT): $(SRCDIR)/doc/makedoc.c
+	$(CC_FOR_BUILD) -I. -o $@ $(SRCDIR)/doc/makedoc.c
 
 doc/neomuttrc: $(SRCDIR)/init.h doc/makedoc$(EXEEXT) $(SRCDIR)/doc/neomuttrc.head
 	sed -e 's,@docdir@,$(docdir),' $(SRCDIR)/doc/neomuttrc.head \
diff --git a/hcache/Makefile.am b/hcache/Makefile.am
index b0f67044e..4de380be9 100644
--- a/hcache/Makefile.am
+++ b/hcache/Makefile.am
@@ -36,8 +36,8 @@ if BUILD_HC_TC
 libhcache_a_SOURCES += tc.c
 endif
 
-LIBMUTT = -L../lib -lmutt
-LIBMUTTDEPS = $(top_srcdir)/mutt/lib.h ../mutt/libmutt.a
+LIBMUTT = -L../mutt -lmutt
+LIBMUTTDEPS = $(top_srcdir)/mutt/mutt.h ../mutt/libmutt.a
 
 BUILT_SOURCES = $(HCVERSION)
 
diff --git a/mutt/Makefile.am b/mutt/Makefile.am
index f7a5dd642..2da60748f 100644
--- a/mutt/Makefile.am
+++ b/mutt/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/flymake.am
 
 AUTOMAKE_OPTIONS = 1.6 foreign
 
-EXTRA_DIST = lib.h base64.h buffer.h date.h debug.h exit.h file.h hash.h list.h mapping.h mbyte.h md5.h memory.h message.h queue.h sha1.h string2.h
+EXTRA_DIST = mutt.h base64.h buffer.h date.h debug.h exit.h file.h hash.h list.h mapping.h mbyte.h md5.h memory.h message.h queue.h sha1.h string2.h
 
 AM_CPPFLAGS = -I$(top_srcdir)