projects / mmh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make POP support always be turned on.
[mmh] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a3097e0..9d10a03 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I m4
 ## LDADD is included in the program-specific LDADD since we want to add
 ## to this list of libraries, not replace it.
 ##
-LDADD = sbr/libmh.a
+LDADD = sbr/libmh.a sbr/libdtimep.a
 
 ##
 ## These are used to create the default mhn.defaults config file
@@ -35,6 +35,13 @@ auxexecdir = @libdir@
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
             etc/mhn.defaults man/man.sed $(man_MANS)
+clean-local:
+       @rm -rf RPM
+
+##
+## Stuff that should be cleaned via "make maintainer-clean"
+##
+MAINTAINERCLEANFILES = cscope.files cscope.out
 
 ##
 ## Files that need to be built before everything else
@@ -64,10 +71,10 @@ auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
                   uip/spost uip/viamail uip/mhtest
 
 ##
-## Internal libraries that we don't create as part of the build process
+## Internal libraries that we create as part of the build process
 ## but do not install
 ##
-noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
+noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a
 
 ##
 ## These are all of our header files.  Right now we don't install any of
@@ -181,10 +188,8 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 
-uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c
-if POP_SUPPORT
-uip_inc_SOURCES += uip/popsbr.c
-endif
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
+                 uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
 
 uip_install_mh_SOURCES = uip/install-mh.c
@@ -222,10 +227,7 @@ uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
                      uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
 
-uip_msgchk_SOURCES = uip/msgchk.c
-if POP_SUPPORT
-uip_msgchk_SOURCES += uip/popsbr.c
-endif
+uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
 uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
@@ -315,7 +317,7 @@ uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
 config/version.c: Makefile
        sh $(srcdir)/config/version.sh $(VERSION) > $@
 
-sbr/sigmsg.h: Makefile $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
+sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
        $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
@@ -340,35 +342,40 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
 ## between different programs.
 ##
 install-exec-hook:
-       rm -f $(DESTDIR)/$(bindir)/flists$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/folders$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/unseen$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/prev$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/next$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/flist$(EXEEXT) $(DESTDIR)/$(bindir)/flists$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/folder$(EXEEXT) $(DESTDIR)/$(bindir)/folders$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/new$(EXEEXT) $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/new$(EXEEXT) $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/new$(EXEEXT) $(DESTDIR)/$(bindir)/unseen$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/show$(EXEEXT) $(DESTDIR)/$(bindir)/prev$(EXEEXT)
-       ln $(DESTDIR)/$(bindir)/show$(EXEEXT) $(DESTDIR)/$(bindir)/next$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
+       ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT)
+       if test x$(SETGID_MAIL) != x; then \
+               chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT); \
+               chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
+       fi
 
 install-data-hook:
-       ln $(DESTDIR)/$(man5dir)/mh-profile.5 $(DESTDIR)/$(man5dir)/mh_profile.5
+       rm -f $(DESTDIR)$(man5dir)/mh_profile.5
+       ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5
 ##
 ## Make sure we remove those links at uninstall time
 ##
 uninstall-hook:
-       rm -f $(DESTDIR)/$(bindir)/flists$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/folders$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/fnext$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/fprev$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/unseen$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/prev$(EXEEXT)
-       rm -f $(DESTDIR)/$(bindir)/next$(EXEEXT)
-       rm -f $(DESTDIR)/$(man5dir)/mh_profile.5
+       rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
+       rm -f $(DESTDIR)$(man5dir)/mh_profile.5
 
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
@@ -380,7 +387,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
                      sbr/context_replace.c sbr/context_save.c \
                      sbr/copy.c sbr/copyip.c sbr/cpydata.c \
                      sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
-                     sbr/done.c sbr/dtime.c sbr/dtimep.l \
+                     sbr/done.c sbr/dtime.c \
                      sbr/error.c  sbr/ext_hook.c sbr/fdcompare.c \
                      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
                      sbr/folder_free.c sbr/folder_pack.c \
@@ -414,6 +421,9 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DDEFAULT_EDITOR='"$(default_editor)"' \
                -DDEFAULT_PAGER='"$(default_pager)"'
 
+sbr_libdtimep_a_SOURCES = sbr/dtimep.l
+sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
+
 mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c
 
 ##
@@ -442,11 +452,6 @@ man/man.sed: Makefile
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@
-if POP_SUPPORT
-       echo '/^%nmhbeginpop%/d;/^%nmhendpop%/d' >> $@
-else
-       echo '/^%nmhbeginpop%/,/^%nmhendpop%/d' >> $@
-endif
        echo '/%components%/r $(top_srcdir)/etc/components' >> $@
        echo ' s,%components%,,g' >> $@
        echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
@@ -473,7 +478,7 @@ endif
 ## Our RPM build target
 ##
 
-rpm: $(DIST_ARCHIVES)
+rpm: dist
        @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
        @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
@@ -482,3 +487,11 @@ rpm: $(DIST_ARCHIVES)
        @rpmbuild --define '_topdir $(rpmdir)' \
          --define '_tmppath %{_topdir}/TMP' \
          -ba $(rpmdir)/SPECS/nmh.spec
+
+##
+## A target to build information needed by cscope
+##
+
+cscope:
+       echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
+       find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
meillo's mail handler