X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=b201ba82024fec53d3abedb2b80ed769a66862f8;hp=5cf8de8c7384aa6a56f9b549dd220e519fc36777;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=1f2ac11f2012a0cc6c8a9fb01aed29b267411539

diff --git a/Makefile.am b/Makefile.am
index 5cf8de8..b201ba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ NNTP_SUBDIR = nntp
 NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
-SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po lib-lib intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
@@ -50,9 +50,11 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	xterm.c
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
-	-Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+	-Llib-lib -llib -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_builddir)/lib/libsane.a \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+		      $(top_builddir)/lib-lib/liblib.a \
+		      $(top_builddir)/lib/libsane.a \
 	$(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
@@ -89,7 +91,7 @@ EXTRA_muttng_SOURCES = \
 	crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
 	sidebar.h state.h
 
-EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
+EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	configure acconfig.h \
 	account.h alias.h attach.h recvattach.h handler.h thread.h \
 	buffer.h buffy.h \
@@ -108,29 +110,26 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
 	muttngbug pgppacket.h depcomp ascii.h BEWARE \
 	mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
-	snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
+	regex.c mutt_libesmtp.h crypt-gpgme.h
 
-muttng_dotlock_SOURCES = mutt_dotlock.c
+muttng_dotlock_SOURCES = dotlock.c
 muttng_dotlock_LDADD = @LIBOBJS@
 muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
 pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
-pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib -lsane
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib -lsane
 pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 
 pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-mutt_dotlock.c: dotlock.c
-	cp $(srcdir)/dotlock.c mutt_dotlock.c
-
-CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
+CLEANFILES = stamp-doc-rc makedoc \
 	keymap_alldefs.h keymap_defs.h version.h
 
 ACLOCAL_AMFLAGS = -I m4
 
-LDADD = @LIBOBJS@ @INTLLIBS@
+LDADD = @LIBOBJS@ @LIBINTL@
 
 OPS=@OPS@
 
@@ -152,7 +151,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
 			> keymap_alldefs.h
 
-version.h: Makefile
+version.h: Makefile.am
 	echo "#define MUTT_REVISION \"git\"" > version.h
 
 reldate: