X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=9978ecdc3952c262740d9df21b55ab6dfcbe0261;hp=f09fc6ca5352ee7313204ffd409511b16526911c;hb=9eb790d6eb4a56416d342816e1140aabd9c12de8;hpb=1410cfc03a04ccce7aac48a62f9d465ab341cef1 diff --git a/Makefile.am b/Makefile.am index f09fc6c..9978ecd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,50 +2,42 @@ ## Use aclocal -I m4; automake --foreign AUTOMAKE_OPTIONS = foreign -EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc - -.cpkg.c: ; ./lib-lua/luapkg2c.pl -c $< > $@ +EXTRA_PROGRAMS = madmutt_dotlock if BUILD_NNTP NNTP_SUBDIR = nntp endif -SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \ - lib-lua lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \ +SUBDIRS = tools intl m4 po \ + lib-lua lib-mime lib-lib lib-mx lib-sys lib-ui \ pop imap $(NNTP_SUBDIR) BUILT_SOURCES = keymap_defs.h charset.gperf DISTCLEANFILES = $(BUILT_SOURCES) -bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng +bin_PROGRAMS = madmutt madmutt_dotlock madmutt_SOURCES = $(BUILT_SOURCES) \ - alias.cpkg attach.c base64.c browser.c buffy.c charset.c commands.c \ - compose.c copy.c editmsg.c init.c keymap.c lib.c \ - flags.c from.c handler.c headers.c help.c hook.c \ - main.c muttlib.c mutt_idna.c pager.c pattern.c postpone.c recvattach.c recvcmd.c \ - score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c - -madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ - $(top_builddir)/lib-mime/libmime.a \ - $(top_builddir)/lib-crypt/libcrypt.a \ + alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \ + compose.c copy.c crypt.c editmsg.c init.c keymap.c flags.c from.c \ + handler.c headers.c help.c hook.c main.c muttlib.c mutt_idna.c \ + pager.c pattern.c postpone.c recvattach.c recvcmd.c score.c send.c \ + sendlib.c send_smtp.c sort.c state.c thread.c account.c remailer.c \ + mutt_sasl.c + +madmutt_LDADD = $(top_builddir)/lib-mime/libmime.a \ $(top_builddir)/lib-mx/libmx.a \ $(top_builddir)/imap/libimap.a \ $(top_builddir)/pop/libpop.a \ $(LIBNNTP) \ - $(top_builddir)/lib-hash/libhash.a \ $(top_builddir)/lib-sys/libsys.a \ $(top_builddir)/lib-ui/libui.a \ $(top_builddir)/lib-lua/liblua.a \ $(top_builddir)/lib-lib/liblib.a \ $(MUTTLIBS) $(INTLLIBS) $(LIBICONV) -madmutt_DEPENDENCIES = $(top_builddir)/lib-lua/madmutt.h \ - $(top_builddir)/lib-lua/lua-token.h \ - @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ - $(top_builddir)/lib-lib/liblib.a \ +madmutt_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a \ $(top_builddir)/lib-mime/libmime.a \ - $(top_builddir)/lib-crypt/libcrypt.a \ - $(top_builddir)/lib-hash/libhash.a \ + $(top_builddir)/lib-sys/libsys.a \ $(top_builddir)/lib-ui/libui.a \ $(top_builddir)/lib-lua/liblua.a \ $(top_builddir)/lib-mx/libmx.a \ @@ -54,10 +46,6 @@ madmutt_DEPENDENCIES = $(top_builddir)/lib-lua/madmutt.h \ $(top_builddir)/imap/libimap.a \ $(LIBNNTPDEPS) $(INTLDEPS) -makedoc_SOURCES = makedoc.c -makedoc_LDADD = -Llib-lib -llib -makedoc_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a - CPP=@CPP@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ @@ -68,48 +56,27 @@ INCLUDES=-I$(top_srcdir) $(GPGME_CFLAGS) -Iintl CPPFLAGS=@CPPFLAGS@ -I$(includedir) -EXTRA_madmutt_SOURCES = \ - account.c mutt_sasl.c dotlock.c remailer.c \ - alias.h browser.h remailer.h state.h \ - mutt_idna.h mutt_libesmtp.c state.h - EXTRA_DIST = config.rpath COPYRIGHT GPL OPS TODO \ configure account.h alias.h attach.h recvattach.h handler.h thread.h \ - buffy.h charset.h copy.h dotlock.h functions.def gen_defs \ - recvattach.h handler.h thread.h globals.h init.h keymap.h \ - mime.h mutt.h mutt_sasl.h pager.h protos.h \ - sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \ - lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \ - makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h + alias.h browser.h remailer.h state.h mutt_idna.h state.h buffy.h \ + charset.h copy.h dotlock.h functions.def gen_defs recvattach.h handler.h \ + thread.h globals.h init.h keymap.h mime.h mutt.h mutt_sasl.h pager.h \ + protos.h sort.h autogen.sh remailer.h browser.h state.h README.SSL \ + depcomp mutt_idna.h send_smtp.h madmutt_dotlock_SOURCES = dotlock.c -madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@ -madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a - -pgpringng_SOURCES = pgppubring.c lib.c extlib.c -pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \ - -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt -pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \ - $(top_builddir)/lib-lib/liblib.a \ - $(top_builddir)/lib-hash/libhash.a +madmutt_dotlock_LDADD = $(top_builddir)/lib-lib/liblib.a +madmutt_dotlock_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a -pgpewrapng_SOURCES = pgpewrap.c -pgpewrapng_LDADD = -pgpewrapng_DEPENDENCIES = - -CLEANFILES = stamp-doc-rc makedoc keymap_defs.h Madmuttrc +CLEANFILES = keymap_defs.h ACLOCAL_AMFLAGS = -I m4 -LDADD = @LIBOBJS@ @LIBINTL@ +LDADD = @LIBINTL@ charset.gperf: charset.def sh $< > $@ -smime_keysng: $(srcdir)/smime_keys.pl - cp $(srcdir)/smime_keys.pl smime_keysng - chmod +x smime_keysng - keymap_defs.h: OPS $(srcdir)/gen_defs $^ > keymap_defs.h @@ -124,32 +91,8 @@ install-exec-hook: { echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \ fi -install-data-local: Madmuttrc - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) - -if [ -f $(DESTDIR)$(pkgdatadir)/Madmuttrc ] ; then \ - mv $(DESTDIR)$(pkgdatadir)/Madmuttrc* $(DESTDIR)$(sysconfdir) ; \ - elif [ -f $(DESTDIR)$(pkgdatadir)/../Madmuttrc ] ; then \ - mv $(DESTDIR)$(pkgdatadir)/../Madmuttrc* $(DESTDIR)$(sysconfdir) ; \ - elif [ ! -f $(DESTDIR)$(sysconfdir)/Madmuttrc ] ; then \ - $(INSTALL) -m 644 Madmuttrc $(DESTDIR)$(sysconfdir) ; \ - fi - -if [ ! -f $(DESTDIR)$(sysconfdir)/madmutt-mime.types ]; then \ - $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/madmutt-mime.types; \ - fi - - -update-doc: stamp-doc-rc - (cd doc && $(MAKE) update-doc) - -Madmuttrc: stamp-doc-rc - -stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head - -rm -f Madmuttrc stamp-doc-rc - $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ - $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc - touch $@ - --include cflags.mk +include tools/cpkg2c.mk +-include tools/cflags.mk wc: @sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'