head 1.49; access; symbols PETIDOMO_4_0b6:1.49 PETIDOMO_4_0b5:1.49 PETIDOMO_4_0b4:1.48 PETIDOMO_4_0b3:1.46 BEFORETHL:1.46; locks; strict; comment @# @; 1.49 date 2004.03.09.16.00.27; author thl; state Exp; branches; next 1.48; 1.48 date 2004.03.09.13.19.33; author thl; state Exp; branches; next 1.47; 1.47 date 2004.02.02.20.28.54; author thl; state Exp; branches; next 1.46; 1.46 date 2001.08.20.13.08.21; author simons; state Exp; branches; next 1.45; 1.45 date 2001.01.21.12.20.41; author rse; state Exp; branches; next 1.44; 1.44 date 2001.01.20.15.18.59; author simons; state Exp; branches; next 1.43; 1.43 date 2001.01.20.14.27.11; author rse; state Exp; branches; next 1.42; 1.42 date 2001.01.20.14.17.48; author rse; state Exp; branches; next 1.41; 1.41 date 2001.01.20.13.58.45; author simons; state Exp; branches; next 1.40; 1.40 date 2001.01.20.13.42.01; author simons; state Exp; branches; next 1.39; 1.39 date 2001.01.20.13.34.57; author rse; state Exp; branches; next 1.38; 1.38 date 2001.01.20.13.26.00; author simons; state Exp; branches; next 1.37; 1.37 date 2001.01.19.21.42.34; author simons; state Exp; branches; next 1.36; 1.36 date 2001.01.19.21.39.49; author simons; state Exp; branches; next 1.35; 1.35 date 2001.01.19.16.19.59; author simons; state Exp; branches; next 1.34; 1.34 date 2001.01.19.15.09.12; author rse; state Exp; branches; next 1.33; 1.33 date 2001.01.19.15.01.19; author rse; state Exp; branches; next 1.32; 1.32 date 2001.01.19.14.14.18; author rse; state Exp; branches; next 1.31; 1.31 date 2001.01.19.12.50.55; author simons; state Exp; branches; next 1.30; 1.30 date 2001.01.18.20.22.13; author rse; state Exp; branches; next 1.29; 1.29 date 2001.01.18.20.20.02; author rse; state Exp; branches; next 1.28; 1.28 date 2001.01.18.13.17.11; author rse; state Exp; branches; next 1.27; 1.27 date 2001.01.18.13.10.18; author rse; state Exp; branches; next 1.26; 1.26 date 2001.01.18.12.54.56; author rse; state Exp; branches; next 1.25; 1.25 date 2001.01.18.12.28.24; author rse; state Exp; branches; next 1.24; 1.24 date 2001.01.16.11.33.36; author simons; state Exp; branches; next 1.23; 1.23 date 2001.01.15.18.48.49; author simons; state Exp; branches; next 1.22; 1.22 date 2001.01.15.16.29.11; author simons; state Exp; branches; next 1.21; 1.21 date 2001.01.11.14.11.33; author simons; state Exp; branches; next 1.20; 1.20 date 2001.01.08.20.40.24; author simons; state Exp; branches; next 1.19; 1.19 date 2001.01.08.16.19.32; author simons; state Exp; branches; next 1.18; 1.18 date 2001.01.08.15.54.18; author simons; state Exp; branches; next 1.17; 1.17 date 2001.01.06.14.12.21; author simons; state Exp; branches; next 1.16; 1.16 date 2000.12.16.13.11.54; author simons; state Exp; branches; next 1.15; 1.15 date 2000.12.16.12.14.15; author simons; state Exp; branches; next 1.14; 1.14 date 2000.12.15.16.58.11; author simons; state Exp; branches; next 1.13; 1.13 date 2000.12.15.16.16.07; author simons; state Exp; branches; next 1.12; 1.12 date 2000.12.15.15.56.46; author simons; state Exp; branches; next 1.11; 1.11 date 2000.12.15.15.48.00; author simons; state Exp; branches; next 1.10; 1.10 date 2000.12.15.14.54.00; author simons; state Exp; branches; next 1.9; 1.9 date 2000.12.14.16.43.10; author simons; state Exp; branches; next 1.8; 1.8 date 2000.12.14.16.08.47; author simons; state Exp; branches; next 1.7; 1.7 date 2000.12.14.15.35.11; author simons; state Exp; branches; next 1.6; 1.6 date 2000.12.14.15.30.52; author simons; state Exp; branches; next 1.5; 1.5 date 2000.12.14.15.26.44; author simons; state Exp; branches; next 1.4; 1.4 date 2000.12.14.15.08.14; author simons; state Exp; branches; next 1.3; 1.3 date 2000.12.13.16.53.19; author simons; state Exp; branches; next 1.2; 1.2 date 2000.12.13.16.42.17; author simons; state Exp; branches; next 1.1; 1.1 date 2000.12.13.15.16.34; author simons; state Exp; branches; next ; desc @@ 1.49 log @@@LIBS@@ should be at the _end_ of the LIBS definition, not at the beginning. Because usually the stuff in the sublibs want to use the stuff in @@LIBS@@ theirself. (hint from rse) @ text @# # Petidomo Makefile # prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ bindir = @@bindir@@ libexecdir = @@libexecdir@@/petidomo datadir = @@datadir@@/petidomo sysconfdir = @@sysconfdir@@ localstatedir = @@localstatedir@@/petidomo mandir = @@mandir@@ DESTDIR = CC = @@CC@@ AR = ar RANLIB = @@RANLIB@@ LEX = @@LEX@@ YACC = @@YACC@@ SHTOOL = ./shtool CFLAGS = @@CFLAGS@@ CPPFLAGS = @@CPPFLAGS@@ @@DEFS@@ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" -DDATADIR=\"$(datadir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" LDFLAGS = @@LDFLAGS@@ FLAGS_TO_PASS = MFLAGS="$(MFLAGS)" CC="$(CC)" AR="$(AR)" \ RANLIB="$(RANLIB)" LEX="$(LEX)" \ YACC="$(YACC)" CFLAGS="$(CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" OBJS = acl.o archive.o authen.o help.o io.o generate-cookie.o \ filter.o handleacl.o hermes.o index.o config-files.o \ listserv.o mailer.o members.o parsearray.o password.o \ rfcparse.o subscribe.o tool.o unsubscribe.o main.o \ queue-command.o queue-posting.o approve.o address-db.o \ version.o LIBS = librfc822/librfc822.a libmpools/libmpools.a \ liblists/liblists.a libargv/libargv.a \ libconfigfile/libconfigfile.a libtext/libtext.a @@LIBS@@ .SUFFIXES: .SUFFIXES: .c .o .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) -c $< all: petidomo petidomo.1 petidomo: $(OBJS) $(LIBS) $(CC) $(OBJS) -o $@@ $(LDFLAGS) $(LIBS) petidomo.1: petidomo.pod V=`$(SHTOOL) version -lc -dlong version.c`; \ sed -e "s;@@V@@;$$V;g" /tmp/petidomo.pod; \ pod2man --section=1 --date="$$V" \ --center="Petidomo" --release="Petidomo" \ /tmp/petidomo.pod >petidomo.1; \ rm -f /tmp/petidomo.pod acl.c acl-scan.h: acl.y $(YACC) -d -p acl acl.y mv y.tab.c acl.c mv y.tab.h acl-scan.h acl-scan.c: acl-scan.l acl-scan.h $(LEX) -i -Pacl acl-scan.l mv lex.acl.c acl-scan.c acl.c: acl-scan.c $(LIBS): @@subdir=`echo $@@ | sed -e 's@@/.*@@@@'`; \ echo "===> $$subdir"; \ cd $$subdir && $(MAKE) $(FLAGS_TO_PASS); \ echo "<=== $$subdir" install: all $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(sysconfdir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)/lists $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)/ack-queue $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libexecdir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 $(SHTOOL) install -c -s -m 555 petidomo $(DESTDIR)$(bindir) $(SHTOOL) install -c -m 755 petidomo-approve $(DESTDIR)$(bindir) $(SHTOOL) install -c -m 755 petidomo-kickout $(DESTDIR)$(bindir) $(SHTOOL) install -c -m 644 petidomo.1 $(DESTDIR)$(mandir)/man1/petidomo.1 $(SHTOOL) install -c -m 644 config/petidomo.conf $(DESTDIR)$(sysconfdir)/petidomo.conf-sample $(SHTOOL) install -c -m 644 config/petidomo.acl $(DESTDIR)$(sysconfdir)/petidomo.acl-sample $(SHTOOL) install -c -m 444 config/help $(DESTDIR)$(datadir) if [ ! -f $(DESTDIR)$(localstatedir)/index ] ; then $(SHTOOL) install -c -m 444 config/index $(DESTDIR)$(localstatedir); fi $(SHTOOL) install -c -m 555 filter/insert-name-in-subject.sh $(DESTDIR)$(libexecdir) $(SHTOOL) install -c -m 555 filter/pgp-decrypt.sh $(DESTDIR)$(libexecdir) $(SHTOOL) install -c -m 555 filter/pgp-encrypt.sh $(DESTDIR)$(libexecdir) $(SHTOOL) install -c -m 555 filter/rfc2369.sh $(DESTDIR)$(libexecdir) install-testlist: $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)/lists/testlist $(SHTOOL) install -c -m 644 config/list-config $(DESTDIR)$(localstatedir)/lists/testlist/config $(SHTOOL) install -c -m 644 config/list-acl $(DESTDIR)$(localstatedir)/lists/testlist/acl @@rm -f $(DESTDIR)$(localstatedir)/lists/testlist/list $(SHTOOL) install -c -m 644 /dev/null $(DESTDIR)$(localstatedir)/lists/testlist/list clean distclean realclean:: @@for subdir in lib* docs; do \ echo "===> $$subdir"; \ (cd $$subdir && $(MAKE) $(FLAGS_TO_PASS) $@@); \ echo "<=== $$subdir"; \ done clean:: rm -f petidomo rm -f petidomo.1 rm -f $(OBJS) rm -f acl-scan.c acl-scan.h acl.c distclean:: clean rm -f config.log config.cache config.status Makefile realclean:: distclean rm -f configure # increase or update version information new-version: @@V="$(VERSION)"; OPT="-e"; [ ".$$V" != . ] && OPT="-s$$V"; \ $(SHTOOL) version -lc -n 'Petidomo' -p petidomo_ $$OPT version.c update-version: @@OPT="-s`$(SHTOOL) version -lc -dshort version.c`"; \ $(SHTOOL) version -lc -n 'Petidomo' -p petidomo_ $$OPT version.c # roll release or snapshot source distribution tarballs dist: distclean @@echo "Rolling RELEASE source distribution tarball"; \ $(SHTOOL) fixperm *; \ V=`$(SHTOOL) version -lc -dshort version.c`; \ $(SHTOOL) tarball \ -o petidomo-$$V.tar.gz -d petidomo-$$V -u ossp -g petidomo \ -e 'CVS,\.cvsignore,\.configure,ChangeLog*,\.\#.*,*~$$,\.[ao]$$' \ -c 'gzip -9' .; \ ls -l petidomo-$$V.tar.gz snap: distclean @@echo "Rolling SNAPSHOT source distribution tarball"; \ $(SHTOOL) fixperm *; \ D=`date '+%Y%d%m'`; \ $(SHTOOL) tarball \ -o petidomo-SNAP-$$D.tar.gz -d petidomo-SNAP-$$V -u ossp -g petidomo \ -e 'CVS,\.cvsignore,\.configure,ChangeLog*,\.\#.*,*~$$,\.[ao]$$' \ -c 'gzip -9' .; \ ls -l petidomo-SNAP-$$D.tar.gz # Dependencies acl.o: libtext/text.h petidomo.h acl-scan.c acl-scan.h acl-scan.o: acl-scan.h address-db.o: libtext/text.h petidomo.h approve.o: petidomo.h libtext/text.h archive.o: libtext/text.h petidomo.h authen.o: libtext/text.h petidomo.h config-files.o: libtext/text.h liblists/lists.h libconfigfile/configfile.h config-files.o: petidomo.h filter.o: petidomo.h generate-cookie.o: petidomo.h handleacl.o: petidomo.h help.o: libtext/text.h petidomo.h hermes.o: libtext/text.h petidomo.h index.o: libtext/text.h petidomo.h io.o: petidomo.h listserv.o: libtext/text.h petidomo.h mailer.o: libtext/text.h petidomo.h main.o: libargv/argv.h libtext/text.h petidomo.h version.c members.o: libtext/text.h petidomo.h parsearray.o: petidomo.h password.o: petidomo.h queue-command.o: libtext/text.h petidomo.h queue-posting.o: libtext/text.h petidomo.h rfcparse.o: librfc822/rfc822.h libtext/text.h petidomo.h subscribe.o: libtext/text.h petidomo.h tool.o: libtext/text.h petidomo.h unsubscribe.o: libtext/text.h petidomo.h @ 1.48 log @flush pending changes before tagging @ text @d40 1 a40 1 LIBS = @@LIBS@@ librfc822/librfc822.a libmpools/libmpools.a \ d42 1 a42 1 libconfigfile/libconfigfile.a libtext/libtext.a @ 1.47 log @correct dir for shtool @ text @d40 1 a40 1 LIBS = librfc822/librfc822.a libmpools/libmpools.a \ @ 1.46 log @Added docs to the list of subdirectories that need to be handled in the *clean targets. @ text @d21 1 a21 1 SHTOOL = ./etc/shtool @ 1.45 log @Make life of RPM builders easier by providing support for the Automake standard variable DESTDIR. @ text @d109 1 a109 1 @@for subdir in lib*; do \ @ 1.44 log @Updated dependencies. @ text @d14 2 d81 19 a99 19 $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(SHTOOL) mkdir -f -p -m 755 $(sysconfdir) $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/lists $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/ack-queue $(SHTOOL) mkdir -f -p -m 755 $(datadir) $(SHTOOL) mkdir -f -p -m 755 $(libexecdir) $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man1 $(SHTOOL) install -c -s -m 555 petidomo $(bindir) $(SHTOOL) install -c -m 755 petidomo-approve $(bindir) $(SHTOOL) install -c -m 755 petidomo-kickout $(bindir) $(SHTOOL) install -c -m 644 petidomo.1 $(mandir)/man1/petidomo.1 $(SHTOOL) install -c -m 644 config/petidomo.conf $(sysconfdir)/petidomo.conf-sample $(SHTOOL) install -c -m 644 config/petidomo.acl $(sysconfdir)/petidomo.acl-sample $(SHTOOL) install -c -m 444 config/help $(datadir) if [ ! -f $(localstatedir)/index ] ; then $(SHTOOL) install -c -m 444 config/index $(localstatedir); fi $(SHTOOL) install -c -m 555 filter/insert-name-in-subject.sh $(libexecdir) $(SHTOOL) install -c -m 555 filter/pgp-decrypt.sh $(libexecdir) $(SHTOOL) install -c -m 555 filter/pgp-encrypt.sh $(libexecdir) $(SHTOOL) install -c -m 555 filter/rfc2369.sh $(libexecdir) d102 5 a106 5 $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/lists/testlist $(SHTOOL) install -c -m 644 config/list-config $(localstatedir)/lists/testlist/config $(SHTOOL) install -c -m 644 config/list-acl $(localstatedir)/lists/testlist/acl @@rm -f $(localstatedir)/lists/testlist/list $(SHTOOL) install -c -m 644 /dev/null $(localstatedir)/lists/testlist/list @ 1.43 log @Provide both "make dist" and "make snap". @ text @d158 1 a158 1 approve.o: petidomo.h @ 1.42 log @Provide commands for increasing or updating version information in version.c: # update the date, but keep version number $ make update-version # interactively specify new version number $ make new-version # batch specify new version version number $ make new-version VERSION=0.8.15 @ text @d133 1 d135 2 a136 3 @@echo "Fixing source tree permissions"; \ $(SHTOOL) fixperm * @@echo "Rolling source distribution tarball"; \ d143 9 @ 1.41 log @Following my quest against underscores in file names, I renamed the default acknowledgment queue directory from "ack_queue" to "ack-queue". @ text @d125 8 @ 1.40 log @Underscores in file names suck, because you need an extra key-press to type them compared to the hyphen. For this reason (and for consistency) I corrected this horrible, horrible mistake of the past and renamed those files. @ text @d82 1 a82 1 $(SHTOOL) mkdir -f -p -m 755 $(localstatedir)/ack_queue @ 1.39 log @Add first cut for a petidomo(1) manual page. @ text @d32 1 a32 1 OBJS = acl.o archive.o authen.o help.o io.o generate_cookie.o \ d36 1 a36 1 queue_command.o queue_posting.o approve.o address-db.o \ d61 1 a61 1 acl.c acl_scan.h: acl.y d64 1 a64 1 mv y.tab.h acl_scan.h d66 3 a68 3 acl_scan.c: acl_scan.l acl_scan.h $(LEX) -i -Pacl acl_scan.l mv lex.acl.c acl_scan.c d70 1 a70 1 acl.c: acl_scan.c d117 1 a117 1 rm -f acl_scan.c acl_scan.h acl.c d138 2 a139 2 acl.o: libtext/text.h petidomo.h acl_scan.c acl_scan.h acl_scan.o: acl_scan.h d147 1 a147 1 generate_cookie.o: petidomo.h d159 2 a160 2 queue_command.o: libtext/text.h petidomo.h queue_posting.o: libtext/text.h petidomo.h @ 1.38 log @Renamed the followings tags in petidomo.conf MTA_Options --> MTAOptions List_Directory --> ListDirectory Ack_Queue_Directory --> AckQueueDirectory for consistency reasons. While I was at it, I also renamed the source file from config.c to config-files.c, because the module config.c is generally associated with GNU autoconf and this has nothing to do with it. @ text @d12 1 d48 2 d53 8 d78 1 a78 1 install: petidomo d85 1 d89 1 d115 1 @ 1.37 log @Cosmetic change. @ text @d31 2 a32 2 OBJS = acl.o archive.o authen.o config.o generate_cookie.o \ filter.o handleacl.o help.o hermes.o index.o io.o \ d130 2 a131 2 config.o: libtext/text.h liblists/lists.h libconfigfile/configfile.h config.o: petidomo.h @ 1.36 log @Updated dependencies. @ text @d35 2 a36 1 queue_command.o queue_posting.o approve.o address-db.o version.o @ 1.35 log @In case no index file is installed, "make install" will create an example file at the correct location so that the admininstrator hopefully figures out that there is some work to be done. @ text @d123 2 d140 1 a140 1 main.o: libargv/argv.h libtext/text.h petidomo.h @ 1.34 log @Provide "make dist" command for rolling distribution tarball. @ text @d78 2 a79 1 $(SHTOOL) install -c -m 444 config/help $(datadir)/help @ 1.33 log @First step in GNu shtool version support: Add version.c and use it for "petidomo --version". Support for handling version.c in Makefile.in is coming later. @ text @d109 11 @ 1.32 log @Do not show subdir walking commands @ text @d35 1 a35 1 queue_command.o queue_posting.o approve.o address-db.o @ 1.31 log @- Word-wrapped long lines to fit into 80 characters per line. - Updated dependencies. - Removed BINDIR from FLAGS_TO_PASS as it isn't needed anymore. @ text @d61 1 a61 1 subdir=`echo $@@ | sed -e 's@@/.*@@@@'`; \ @ 1.30 log @Install petidomo-xxxx tools @ text @d5 7 a11 7 prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ bindir = @@bindir@@ libexecdir = @@libexecdir@@/petidomo datadir = @@datadir@@/petidomo sysconfdir = @@sysconfdir@@ localstatedir = @@localstatedir@@/petidomo d18 1 a18 1 SHTOOL = ./etc/shtool d21 4 a24 3 CPPFLAGS = @@CPPFLAGS@@ @@DEFS@@ -DSYSCONFDIR=\"$(sysconfdir)\" -DLIBEXECDIR=\"$(libexecdir)\" \ -DDATADIR=\"$(datadir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \ -DBINDIR=\"$(bindir)\" d26 4 d31 7 a37 6 OBJS = acl.o archive.o authen.o config.o generate_cookie.o \ filter.o handleacl.o help.o hermes.o index.o io.o listserv.o \ mailer.o members.o parsearray.o password.o rfcparse.o \ subscribe.o tool.o unsubscribe.o main.o queue_command.o \ queue_posting.o approve.o address-db.o LIBS = librfc822/librfc822.a libmpools/libmpools.a liblists/liblists.a libargv/libargv.a \ a39 4 FLAGS_TO_PASS = MFLAGS="$(MFLAGS)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" LEX="$(LEX)" \ YACC="$(YACC)" CFLAGS="$(CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" d111 2 a112 2 acl.o: libtext/text.h petidomo.h acl_scan.c acl_scan.h acl_scan.o: acl_scan.h d126 1 a126 1 main.o: libargv/argv.h petidomo.h d130 2 @ 1.29 log @Show were we are operating @ text @d72 2 @ 1.28 log @New layout @ text @d59 4 a62 1 (cd `echo $@@ | sed -e 's@@/.*@@@@'` && $(MAKE) $(FLAGS_TO_PASS)) d88 5 a92 1 @@for n in lib*; do (cd $$n && $(MAKE) $@@); done @ 1.27 log @New layout @ text @d23 1 a23 1 -DBINDIR=\"$(bindir)\" d34 1 a34 1 FLAGS_TO_PASS = CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" LEX="$(LEX)" \ d69 7 a75 7 $(SHTOOL) install -c -m 644 ../etc/petidomo.conf $(sysconfdir)/petidomo.conf-sample $(SHTOOL) install -c -m 644 ../etc/petidomo.acl $(sysconfdir)/petidomo.acl-sample $(SHTOOL) install -c -m 444 ../etc/help $(datadir)/help $(SHTOOL) install -c -m 555 ../etc/InsertNameInSubject.sh $(libexecdir) $(SHTOOL) install -c -m 555 ../etc/pgp-decrypt.sh $(libexecdir) $(SHTOOL) install -c -m 555 ../etc/pgp-encrypt.sh $(libexecdir) $(SHTOOL) install -c -m 555 ../etc/rfc2369.sh $(libexecdir) d79 2 a80 2 $(SHTOOL) install -c -m 644 ../etc/list-config $(localstatedir)/lists/testlist/config $(SHTOOL) install -c -m 644 ../etc/list-acl $(localstatedir)/lists/testlist/acl @ 1.26 log @Switch to GNU shtool @ text @d18 1 a18 1 SHTOOL = ./shtool @ 1.25 log @fix install-testlist target @ text @d18 1 a18 1 INSTALL = ../etc/install-sh -c d62 14 a75 14 @@if [ ! -d $(bindir) ]; then $(INSTALL) -d $(bindir); fi @@if [ ! -d $(sysconfdir) ]; then $(INSTALL) -d $(sysconfdir); fi @@if [ ! -d $(localstatedir)/lists ]; then $(INSTALL) -d $(localstatedir)/lists; fi @@if [ ! -d $(localstatedir)/ack_queue ]; then $(INSTALL) -d $(localstatedir)/ack_queue; fi @@if [ ! -d $(datadir) ]; then $(INSTALL) -d $(datadir); fi @@if [ ! -d $(libexecdir) ]; then $(INSTALL) -d $(libexecdir); fi $(INSTALL) -s -m 555 petidomo $(bindir) $(INSTALL) -m 644 ../etc/petidomo.conf $(sysconfdir)/petidomo.conf-sample $(INSTALL) -m 644 ../etc/petidomo.acl $(sysconfdir)/petidomo.acl-sample $(INSTALL) -m 444 ../etc/help $(datadir)/help $(INSTALL) -m 555 ../etc/InsertNameInSubject.sh $(libexecdir) $(INSTALL) -m 555 ../etc/pgp-decrypt.sh $(libexecdir) $(INSTALL) -m 555 ../etc/pgp-encrypt.sh $(libexecdir) $(INSTALL) -m 555 ../etc/rfc2369.sh $(libexecdir) d78 3 a80 3 @@if [ ! -d $(localstatedir)/lists/testlist ]; then $(INSTALL) -d $(localstatedir)/lists/testlist; fi $(INSTALL) -m 644 ../etc/list-config $(localstatedir)/lists/testlist/config $(INSTALL) -m 644 ../etc/list-acl $(localstatedir)/lists/testlist/acl d82 1 a82 2 cp /dev/null $(localstatedir)/lists/testlist/list @@chmod 644 $(localstatedir)/lists/testlist/list @ 1.24 log @Implemented the acked-once feature. @ text @d78 6 a83 6 @@if [ ! -d $(localstatedir)/testlist ]; then $(INSTALL) -d $(localstatedir)/testlist; fi $(INSTALL) -m 644 ../etc/list-config $(localstatedir)/testlist/config $(INSTALL) -m 644 ../etc/list-acl $(localstatedir)/testlist/acl @@rm -f $(localstatedir)/testlist/list cp /dev/null $(localstatedir)/testlist/list @@chmod 644 $(localstatedir)/testlist/list @ 1.23 log @Implemented the approve mode, where incoming mails are searched for confirmation cookies and the apropriate queue entries will be executed. @ text @d30 1 a30 1 queue_posting.o approve.o @ 1.22 log @Implemented spooling mechanism for requests and postings that need an acknowledgement to be processed. The code is there, it just isn't called yet. @ text @d30 1 a30 1 queue_posting.o @ 1.21 log @Added generate_cookie() routine taken from mapSoN. @ text @a11 8 # delete me #sharedstatedir = @@sharedstatedir@@ #sbindir = @@sbindir@@ #libdir = @@libdir@@/petidomo #infodir = @@infodir@@ #mandir = @@mandir@@ #includedir = @@includedir@@ # delete me d22 2 a23 1 -DDATADIR=\"$(datadir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" d29 2 a30 1 subscribe.o tool.o unsubscribe.o main.o d64 2 a65 1 @@if [ ! -d $(localstatedir) ]; then $(INSTALL) -d $(localstatedir); fi @ 1.20 log @Completed the install-testlist target. @ text @d33 1 a33 1 OBJS = acl.o archive.o authen.o config.o \ d110 2 a111 1 config.o: liblists/lists.h libconfigfile/configfile.h petidomo.h d113 1 @ 1.19 log @Added dependencies. @ text @d84 5 @ 1.18 log @Added preliminary install and install-testlist target. @ text @d101 21 @ 1.17 log @Replaced the old basedir-mechanism in Petidomo, which used to be the home directory of the petidomo user. Now, Petidomo expects its master config file in ETCDIR, which is '/etc' per default. All other paths will be set there at run-time. @ text @d8 2 a9 3 sbindir = @@sbindir@@ libexecdir = @@libexecdir@@ datadir = @@datadir@@ d11 9 a19 7 sharedstatedir = @@sharedstatedir@@ localstatedir = @@localstatedir@@ libdir = @@libdir@@/petidomo infodir = @@infodir@@ mandir = @@mandir@@ includedir = @@includedir@@ ETCDIR = @@ETCDIR@@ d26 1 a26 1 INSTALL = ../etc/install-sh d29 2 a30 1 CPPFLAGS = @@CPPFLAGS@@ @@DEFS@@ -DETCDIR=\"$(ETCDIR)\" d67 14 d82 2 a83 11 install: petidomo if [ ! -d $(bindir) ]; then $(INSTALL) -d $(bindir); fi $(INSTALL) -c -s -m 555 petidomo $(bindir) # if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi $(INSTALL) -c -m 444 ../etc/help $(libdir)/help # #if [ ! -d $(sysconfdir) ]; then $(INSTALL) -d $(sysconfdir); fi #$(INSTALL) -c -m 640 ../etc/master-config $(sysconfdir)/petidomo.conf #$(INSTALL) -c -m 640 ../etc/master-acl $(sysconfdir)/acl @ 1.16 log @Reversed all changes concerning C++ in Petidomo ... it isn't worth the major rewrite. @ text @d18 1 d28 1 a28 1 CPPFLAGS = @@CPPFLAGS@@ @@DEFS@@ @ 1.15 log @Added preliminary install target. @ text @a19 1 CXX = @@CXX@@ a26 1 CXXFLAGS = @@CXXFLAGS@@ d34 1 a34 1 LIBS = librfc822/librfc822.a liblists/liblists.a libargv/libargv.a \ d37 2 a38 2 FLAGS_TO_PASS = CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" LEX="$(LEX)" \ YACC="$(YACC)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ d42 1 a42 1 .SUFFIXES: .c .o .cpp a46 3 .cpp.o: $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< d48 1 a48 1 $(CXX) $(OBJS) -o $@@ $(LDFLAGS) $(LIBS) a92 21 acl.o: libtext/text.h petidomo.h acl_scan.c acl_scan.h acl_scan.o: acl_scan.h archive.o: libtext/text.h petidomo.h authen.o: libtext/text.h petidomo.h config.o: liblists/lists.h libconfigfile/configfile.h petidomo.h filter.o: petidomo.h handleacl.o: petidomo.h help.o: libtext/text.h petidomo.h hermes.o: libtext/text.h petidomo.h index.o: libtext/text.h petidomo.h io.o: petidomo.h listserv.o: libtext/text.h petidomo.h mailer.o: libtext/text.h petidomo.h main.o: petidomo.h libargv/argv.h members.o: libtext/text.h petidomo.h parsearray.o: petidomo.h password.o: petidomo.h rfcparse.o: librfc822/rfc822.hpp libtext/text.h petidomo.h subscribe.o: libtext/text.h petidomo.h tool.o: libtext/text.h petidomo.h unsubscribe.o: libtext/text.h petidomo.h @ 1.14 log @The petidomo binary will now be linked with $(CXX). Updated dependencies. @ text @d14 1 a14 1 libdir = @@libdir@@ d25 1 d68 13 @ 1.13 log @Removed the signature code and all code that depended on it. In the new Petidomo, the signature mechanism for server mails will work differently. @ text @d52 1 a52 1 $(CC) $(OBJS) -o $@@ $(LDFLAGS) $(LIBS) d84 21 @ 1.12 log @Removed the mail rescue mechanism and all relating code. I guess _nobody_ ever used that mechanism anyway, not even me. :-) @ text @d34 1 a34 1 subscribe.o tool.o signature.o unsubscribe.o main.o a83 25 acl.o: libtext/text.h petidomo.h libargv/argv.h acl_scan.c acl_scan.h acl_scan.o: acl_scan.h archive.o: libtext/text.h petidomo.h libargv/argv.h authen.o: libtext/text.h petidomo.h libargv/argv.h config.o: liblists/lists.h libconfigfile/configfile.h petidomo.h config.o: libargv/argv.h exit.o: libtext/text.h petidomo.h libargv/argv.h filter.o: petidomo.h libargv/argv.h handleacl.o: petidomo.h libargv/argv.h help.o: libtext/text.h petidomo.h libargv/argv.h hermes.o: libtext/text.h petidomo.h libargv/argv.h index.o: libtext/text.h petidomo.h libargv/argv.h io.o: petidomo.h libargv/argv.h listserv.o: libtext/text.h petidomo.h libargv/argv.h mailer.o: libtext/text.h petidomo.h libargv/argv.h main.o: petidomo.h libargv/argv.h members.o: libtext/text.h petidomo.h libargv/argv.h parsearray.o: petidomo.h libargv/argv.h password.o: petidomo.h libargv/argv.h rfcparse.o: librfc822/rfc822.h libtext/text.h petidomo.h libargv/argv.h rfcparse.o: signature.o: petidomo.h libargv/argv.h subscribe.o: libtext/text.h petidomo.h libargv/argv.h tool.o: libtext/text.h petidomo.h libargv/argv.h unsubscribe.o: libtext/text.h petidomo.h libargv/argv.h @ 1.11 log @ - Removed all debugging code. Now that Petidomo will be "rewritten" in C++, I need a new paradigm for debugging anyway and the old solution of mine was to messy for my taste anyway. - Petidomo no longer cares under what name it has been started. The different modes of operation will now be distinguished by a mandatory command line parameter. @ text @d31 1 a31 1 OBJS = acl.o archive.o authen.o config.o exit.o \ @ 1.10 log @Added support for C++ source modules within Petidomo. @ text @d5 14 d31 1 a31 1 OBJS = acl.o archive.o argvSetDebugLevel.o authen.o config.o exit.o \ d36 1 a36 2 libconfigfile/libconfigfile.a libtext/libtext.a \ libdebug/libdebug.a a50 2 all: hermes listserv a53 4 hermes listserv: petidomo @@rm -f $@@ ln -s petidomo $@@ d72 1 a72 1 rm -f petidomo listserv hermes d84 1 a84 1 acl.o: libtext/text.h petidomo.h libargv/argv.h debug.h acl_scan.c acl_scan.h d86 2 a87 3 archive.o: libtext/text.h petidomo.h libargv/argv.h debug.h argvSetDebugLevel.o: debug.h libargv/argv.h authen.o: libtext/text.h petidomo.h libargv/argv.h debug.h d89 14 a102 14 config.o: libargv/argv.h debug.h exit.o: libtext/text.h petidomo.h libargv/argv.h debug.h filter.o: petidomo.h libargv/argv.h debug.h handleacl.o: petidomo.h libargv/argv.h debug.h help.o: libtext/text.h petidomo.h libargv/argv.h debug.h hermes.o: libtext/text.h petidomo.h libargv/argv.h debug.h index.o: libtext/text.h petidomo.h libargv/argv.h debug.h io.o: petidomo.h libargv/argv.h debug.h listserv.o: libtext/text.h petidomo.h libargv/argv.h debug.h mailer.o: libtext/text.h petidomo.h libargv/argv.h debug.h main.o: petidomo.h libargv/argv.h debug.h members.o: libtext/text.h petidomo.h libargv/argv.h debug.h parsearray.o: petidomo.h libargv/argv.h debug.h password.o: petidomo.h libargv/argv.h debug.h d104 5 a108 5 rfcparse.o: debug.h signature.o: petidomo.h libargv/argv.h debug.h subscribe.o: libtext/text.h petidomo.h libargv/argv.h debug.h tool.o: libtext/text.h petidomo.h libargv/argv.h debug.h unsubscribe.o: libtext/text.h petidomo.h libargv/argv.h debug.h @ 1.9 log @Modified the main Makefile so that it will pass the values determined by Autoconf down to the libraries. @ text @d6 1 d13 1 d25 3 a27 3 FLAGS_TO_PASS = CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" LEX="$(LEX)" \ YACC="$(YACC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS)" d30 1 a30 1 .SUFFIXES: .c .o d34 3 @ 1.8 log @FreeBSD's make again: That stupid thing really doesn't grasp $< targets. @ text @d14 1 d23 4 d54 1 a54 1 (cd `echo $@@ | sed -e 's@@/.*@@@@'` && $(MAKE)) @ 1.7 log @FreeBSD's make sucks big time: It doesn't honor the -C flag. Hence we have to change into the target directory before calling make. @ text @d35 1 a35 1 ln -s $< $@@ @ 1.6 log @BSD make doesn't understand $< like GNU make does, thus it is better to explicitely name the targets for the sake of portability. @ text @d49 1 a49 1 $(MAKE) -C `echo $@@ | sed -e 's@@/.*@@@@'` d52 1 a52 1 @@for n in lib*; do $(MAKE) -C $$n $@@; done @ 1.5 log @Rewrote the makefile to not require GNU make. @ text @d26 1 a26 1 $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@@ d43 1 a43 1 $(LEX) -i -Pacl $< @ 1.4 log @Updated dependencies. @ text @d14 4 a17 7 LIBS = @@LIBS@@ SRCS = acl.c archive.c argvSetDebugLevel.c authen.c config.c exit.c \ filter.c handleacl.c help.c hermes.c index.c io.c listserv.c \ mailer.c members.c parsearray.c password.c rfcparse.c \ subscribe.c tool.c signature.c unsubscribe.c main.c OBJS = ${SRCS:.c=.o} d19 2 a20 1 libconfigfile/libconfigfile.a libtext/libtext.a libdebug/libdebug.a a21 1 .PHONY: all clean distclean realclean d23 1 d25 1 a25 1 %.o : %.c d48 2 a49 2 lib%: $(MAKE) -C $(dir $@@) a52 1 @@$(MAKE) $@@-local d54 1 a54 1 clean-local:: d59 1 a59 1 distclean-local:: clean-local d62 1 a62 1 realclean-local:: distclean-local d65 1 a65 1 # DO NOT DELETE @ 1.3 log @Cosmetic changes to the Makefile ... nothing important. @ text @d70 2 @ 1.2 log @After changing librfc822 to get along without libmpools, the library can (and has been) removed from Petidomo. @ text @d21 2 a22 3 LIBS = librfc822/librfc822.a liblists/liblists.a \ libconfigfile/libconfigfile.a libtext/libtext.a libargv/libargv.a \ libdebug/libdebug.a @ 1.1 log @Rewrote the build process from the scratch. @ text @d21 1 a21 1 LIBS = librfc822/librfc822.a liblists/liblists.a libmpools/libmpools.a \ d64 1 a64 1 rm -f config.log config.cache config.status GNUmakefile @