Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8bc2864..bb631e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
        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
+       score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
@@ -60,7 +60,7 @@ EXTRA_madmutt_SOURCES = \
        alias.h browser.h remailer.h state.h \
        mutt_idna.h mutt_libesmtp.c state.h
 
-EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.MIX TODO \
+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 \
@@ -84,15 +84,12 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc \
-       keymap_alldefs.h keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
 LDADD = @LIBOBJS@ @LIBINTL@
 
-OPS=@OPS@
-
 charset.gperf: charset.def
        sh $< > $@
 
@@ -100,14 +97,9 @@ smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng
 
-Makefile: $(BUILT_SOURCES)
-
-keymap_defs.h: $(OPS)
+keymap_defs.h: OPS
        $(srcdir)/gen_defs $^ > keymap_defs.h
 
-keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.MIX
-       $(srcdir)/gen_defs $^ > keymap_alldefs.h
-
 version.h:
        echo "#define MUTT_REVISION \"git\"" > version.h
 
@@ -122,38 +114,30 @@ install-exec-hook:
                { echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \
        fi
 
-install-data-local: madmuttrc
+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) ; \
+       -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
 
 
-# kluge around automake problems.
-
-dist-hook:
-       -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
-mutt-dist:
-       (cd $(srcdir) && ./build-release )
-
 update-doc: stamp-doc-rc
        (cd doc && $(MAKE) update-doc)
 
-madmuttrc: stamp-doc-rc
+Madmuttrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head
-       -rm -f 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 stamp-doc-rc
+               $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
+       touch $@
 
 
 -include cflags.mk