[Mailagent-svn] SF.net SVN: mailagent:[59] trunk/mailagent/agent
Brought to you by:
rmanfredi
Menu
▾
▴
[Mailagent-svn] SF.net SVN: mailagent:[59] trunk/mailagent/agent
|
From: <rma...@us...> - 2008-08-19 08:48:46
|
Revision: 59
http://mailagent.svn.sourceforge.net/mailagent/?rev=59&view=rev
Author: rmanfredi
Date: 2008-08-19 08:48:44 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Had forgotten to list the remote dependency on termios.pl.
Modified Paths:
--------------
trunk/mailagent/agent/Jmakefile
trunk/mailagent/agent/Makefile.SH
Modified: trunk/mailagent/agent/Jmakefile
===================================================================
--- trunk/mailagent/agent/Jmakefile 2008-08-19 08:44:07 UTC (rev 58)
+++ trunk/mailagent/agent/Jmakefile 2008-08-19 08:48:44 UTC (rev 59)
@@ -50,12 +50,12 @@
* different architectures).
*/
->BINDIR
InstallScript(mailagent,$(BINDIR))
SetSubdirs(pl filter files man test examples)
DependDirs(pl filter)
RemoteDependency(pl/utmp,utmp.pl)
+RemoteDependency(pl/termios,termios.pl)
BINSH = \
|expand f!$(BIN)!
@@ -63,10 +63,6 @@
-expand
magent.sh
->SED
->RM
->MKDEP
-
depend::
($(SED) '/^# DO NOT DELETE/q' Makefile && \
grep '^\$$grep' $(BINSH) | \
Modified: trunk/mailagent/agent/Makefile.SH
===================================================================
--- trunk/mailagent/agent/Makefile.SH 2008-08-19 08:44:07 UTC (rev 58)
+++ trunk/mailagent/agent/Makefile.SH 2008-08-19 08:48:44 UTC (rev 59)
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL70]
-: $X-Id: Jmake.tmpl,v 3.0.1.3 1997/02/28 14:56:16 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-25]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
case $CONFIG in
'')
@@ -22,6 +22,7 @@
echo "Extracting ${DIR}Makefile (with variable substitutions)"
INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
DATE=`date`
$spitshell >Makefile <<!GROK!THIS!
@@ -34,16 +35,16 @@
CURRENT = $CURRENT
DIR = $DIR
INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
########################################################################
# Parameters set by Configure -- edit config.sh if changes are needed
BINDIR = $installbin
CTAGS = ctags
+JCPPFLAGS = $cppflags
L = $manext
MANSRC = $installmansrc
-MAKE = make
-MKDEP = $mkdep \$(DPFLAGS) --
MV = $mv
RM = $rm -f
SCRIPTDIR = $installscript
@@ -59,22 +60,15 @@
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.6 1997/02/28 14:56:01 ram Exp ram $
+# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $
########################################################################
-# Force 'make depend' to be performed first -- do not edit
-
-.FORCE_DEPEND::
-
-all:: .FORCE_DEPEND
-
-########################################################################
# Start of Jmakefile
-# $X-Id: Jmakefile,v 3.0.1.3 1994/10/31 11:12:59 ram Exp ram $
+# $X-Id: Jmakefile,v 3.0.1.4 1999/07/12 13:40:32 ram Exp ram $
#
# Copyright (c) 1990-2006, Raphael Manfredi
-#
+#
# You may redistribute only under the terms of the Artistic License,
# as specified in the README file that comes with the distribution.
# You may reuse parts of this distribution only within the terms of
@@ -82,6 +76,9 @@
# of the source tree for mailagent 3.0.
#
# $X-Log: Jmakefile,v $
+# Revision 3.0.1.4 1999/07/12 13:40:32 ram
+# patch66: will now install examples as well
+#
# Revision 3.0.1.3 1994/10/31 11:12:59 ram
# patch23: file magent.sh now replaces magent.SH to avoid auto-extraction
#
@@ -121,16 +118,20 @@
/bin/sh edusers.SH
-install:: $(SCRIPTS) $(LSCRIPTS)
- @for file in $(SCRIPTS) $(LSCRIPTS); do \
- case '${MFLAGS}' in *[i]*) set +e;; esac; \
- (set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \
+local_install:: $(SCRIPTS) $(LSCRIPTS)
+ @case '${MFLAGS}' in *[i]*) set +e;; esac; \
+ (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+ $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+ for file in $(SCRIPTS) $(LSCRIPTS); do \
+ (set -x; \
+ $(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \
+ exit 1; \
done
-deinstall::
+local_deinstall::
@for file in $(SCRIPTS) $(LSCRIPTS); do \
- case '${MFLAGS}' in *[i]*) set +e;; esac; \
- (set -x; $(RM) $(SCRIPTDIR)/$$file); \
+ case '${MFLAGS}' in *[i]*) set +e;; esac; \
+ (set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$file); \
done
@@ -151,18 +152,21 @@
perl $(TOP)/bin/perload -o magent > $@
chmod +rx $@
-install:: mailagent
- $(INSTALL) -c -m 555 mailagent $(BINDIR)
+local_install:: mailagent
+ @case '${MFLAGS}' in *[i]*) set +e;; esac; \
+ (set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
+ $(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
+ $(INSTALL) -c -m 555 mailagent $(INSTALL_PREFIX)$(BINDIR)
-deinstall::
- $(RM) $(BINDIR)/mailagent
+local_deinstall::
+ $(RM) $(INSTALL_PREFIX)$(BINDIR)/mailagent
depend::
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in pl filter ;\
do \
- (cd $$i ; echo "Depending" "in $(DIR)$$i..."; \
- $(MAKE) $(MFLAGS) depend); \
+ (cd $$i ; echo "Depending" "in $(DIR)$$i..."; \
+ $(MAKE) $(MFLAGS) depend) || exit 1; \
done
.FORCE:
@@ -172,6 +176,11 @@
cd pl/utmp; $(MAKE) utmp.pl
@echo "Continuing in $(CURRENT)..."
+pl/termios/termios.pl: .FORCE
+ @echo "Checking "termios.pl" in "pl/termios"..."
+ cd pl/termios; $(MAKE) termios.pl
+ @echo "Continuing in $(CURRENT)..."
+
BINSH = \
mailpatch.SH \
mailhelp.SH \
@@ -193,29 +202,51 @@
########################################################################
# Common rules for all Makefiles -- do not edit
-emptyrule::
+all::
clean: sub_clean local_clean
realclean: sub_realclean local_realclean
clobber: sub_clobber local_clobber
local_clean::
- $(RM) core *~ *.o
+ if test -f core; then $(RM) core; fi
+ $(RM) *~ *.o
local_realclean:: local_clean
local_clobber:: local_realclean
$(RM) Makefile config.sh
+install:: local_install sub_install
+install.man:: maybe_install.man sub_install.man
+deinstall:: sub_deinstall local_deinstall
+deinstall.man:: sub_deinstall.man maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
Makefile.SH: Jmakefile
-@if test -f $(TOP)/.package; then \
- if test -f Makefile.SH; then \
- echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
- $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
- fi; \
- echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
- $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
- else touch $@; exit 0; fi
+ if test -f Makefile.SH; then \
+ echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
+ $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
+ fi; \
+ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
+ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
+ else touch $@; fi
Makefile: Makefile.SH
/bin/sh Makefile.SH
@@ -234,21 +265,23 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(SUBDIRS) ;\
do \
- (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
- $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \
+ (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
+ $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \
done
-install::
+sub_install::
@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
-deinstall::
+sub_deinstall::
@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
+ @echo "Back to $(CURRENT) for "deinstall...
-install.man::
+sub_install.man::
@$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS=
-deinstall.man::
+sub_deinstall.man::
@$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS=
+ @echo "Back to $(CURRENT) for "deinstall.man...
sub_clean::
@$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS=
@@ -266,49 +299,51 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(SUBDIRS) ;\
do \
- (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
- $(MAKE) $(MFLAGS) tag); \
+ (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
+ $(MAKE) $(MFLAGS) tag) || exit 1; \
done
Makefiles::
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(SUBDIRS);\
do \
- echo "Making "Makefiles" in $(DIR)$$i..."; \
- (cd $$i || exit 1; \
- if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
- $(MAKE) $(MFLAGS) Makefiles) \
+ echo "Making "Makefiles" in $(DIR)$$i..."; \
+ (cd $$i || exit 1; \
+ if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
+ $(MAKE) $(MFLAGS) Makefiles) || exit 1;\
done
Makefiles.SH:: Makefile.SH
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(SUBDIRS);\
do \
- case "$(DIR)$$i/" in \
- */*/*/*/) newtop=../../../..;; \
- */*/*/) newtop=../../..;; \
- */*/) newtop=../..;; \
- */) newtop=..;; \
- esac; \
- case "$(TOP)" in \
- /*) newtop="$(TOP)" ;; \
- esac; \
- echo "Making Makefiles.SH in $(DIR)$$i..."; \
- (cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \
- Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\
- $(MAKE) $(MFLAGS) Makefiles.SH) \
+ case "$(DIR)$$i/" in \
+ */*/*/*/) newtop=../../../..;; \
+ */*/*/) newtop=../../..;; \
+ */*/) newtop=../..;; \
+ */) newtop=..;; \
+ esac; \
+ case "$(TOP)" in \
+ /*) newtop="$(TOP)" ;; \
+ esac; \
+ echo "Making Makefiles.SH in $(DIR)$$i..."; \
+ (cd $$i || exit 1; \
+ if test -f Jmakefile; then \
+ $(MAKE) $(MFLAGS) -f ../Makefile \
+ Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \
+ $(MAKE) $(MFLAGS) Makefiles.SH; \
+ fi; \
+ ) || exit 1; \
done
all::
@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
+local_install::
+local_deinstall::
+local_install.man::
+local_deinstall.man::
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
- @echo "You must run 'make depend' in $(TOP) first."; exit 1
!NO!SUBS!
chmod 644 Makefile
$eunicefix Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
