X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=68235577f41fcf5233ca4086d1a4511352bb66fd;hp=ae01e84b73f95a0ffa223801559c5e3846b9e436;hb=d4483b5add8d25008c305b51729f4a53bccfaab8;hpb=21d34545d4204a0f5672c8bdbeb6a79803eb3a54

diff --git a/Makefile.am b/Makefile.am
index ae01e84..6823557 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
 
@@ -27,7 +27,7 @@ BUILT_SOURCES = keymap_defs.h version.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
-	alias.c ascii.c attach.c \
+	alias.c attach.c \
 	base64.c buffer.c browser.c buffy.c \
 	charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
 	compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
@@ -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 \
@@ -106,31 +108,28 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
 	mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
-	muttngbug pgppacket.h depcomp ascii.h BEWARE \
+	muttngbug pgppacket.h depcomp 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_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c
+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:
@@ -203,3 +202,4 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
 	touch stamp-doc-rc
 
 
+-include cflags.mk