merge OPS that do not need to be split anymore.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b1775c..6ee39c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,17 @@ SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
          lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
          pop imap $(NNTP_SUBDIR)
 
-BUILT_SOURCES = keymap_defs.h version.h
+BUILT_SOURCES = keymap_defs.h version.h charset.gperf
+DISTCLEANFILES = $(BUILT_SOURCES)
 
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
-       alias.c attach.c base64.c browser.c buffy.c \
-       charset.c compress.c commands.c complete.c  \
+       alias.c attach.c base64.c browser.c buffy.c charset.c compress.c commands.c \
        compose.c copy.c editmsg.c init.c keymap.c lib.c \
-       flags.c filter.c from.c handler.c hcache.c hdrline.c headers.c help.c hook.c \
+       flags.c from.c handler.c hcache.c headers.c help.c hook.c \
        main.c mbox.c mh.c muttlib.c mutt_idna.c mx.c \
-       pager.c pattern.c postpone.c query.c \
-       recvattach.c recvcmd.c rfc3676.c \
-       score.c send.c sendlib.c sidebar.c sort.c state.c status.c \
-       thread.c account.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
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
@@ -62,20 +60,16 @@ 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 sidebar.h state.h
+       mutt_idna.h mutt_libesmtp.c state.h
 
-EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
+EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.MIX TODO \
        configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-       buffy.h charset.h compress.h copy.h \
-       dotlock.h functions.def gen_defs \
-       recvattach.h handler.h thread.h \
-       globals.h init.h keymap.h mutt_crypt.h \
+       buffy.h charset.h compress.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 mbox.h mh.h mx.h pager.h protos.h \
-       rfc3676.h sort.h mime.types autogen.sh \
-       OPS.MIX remailer.c remailer.h browser.h state.h \
-       lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \
-       makedoc.c stamp-doc-rc README.SSL smime.h\
-       depcomp mutt_idna.h mutt_libesmtp.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
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
@@ -101,19 +95,20 @@ LDADD = @LIBOBJS@ @LIBINTL@
 
 OPS=@OPS@
 
+charset.gperf: charset.def
+       sh $< > $@
+
 smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng
 
 Makefile: $(BUILT_SOURCES)
 
-keymap_defs.h: $(OPS) $(srcdir)/gen_defs
-       $(srcdir)/gen_defs $(OPS) > keymap_defs.h
+keymap_defs.h: $(OPS)
+       $(srcdir)/gen_defs $^ > keymap_defs.h
 
-keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
-       $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \
-               $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
-                       > keymap_alldefs.h
+keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.MIX
+       $(srcdir)/gen_defs $^ > keymap_alldefs.h
 
 version.h:
        echo "#define MUTT_REVISION \"git\"" > version.h