fix out-of-tree builds

diff --git a/Makefile.am b/Makefile.am
index c49ec5c0fe578d168d5f0822d140416f180ce3de..d4aba214ae0da9a38029d296404037db067f6c14 100644 (file)
--- 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 5c405054649821dbb875ef5b245387ae073a0b03..65d6f2a23786cfc520b6edcdebb9d6fed65b6a78 100644 (file)
--- 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 46cf6d60d46d90c0fded1f80cfc36682bcab465d..d031b5c5b1acbe0b36a2ae7cda623b6cab068dae 100644 (file)
--- 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 7c8df88a1b85dd402b3dde44a0e7a49262c237f0..b34cae0e588d7d80914d231f5b711eb5698e7dc8 100644 (file)
--- 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 b0f67044e1603ae16e411429f00ade4c2d3c0715..4de380be9f3a256dbe2b5a7a529a919c793ca054 100644 (file)
--- 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 f7a5dd6428899800617ffdca1a7d4cf904bc9c16..2da60748fdcaa4d59ad465a9c465b5d3f9e0c320 100644 (file)
--- 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)