[screen-devel] automake patches 6-10

[William Pursell]

--
William Pursell

>From 173c0d11ca3e3a7ef2d230159d7a16c9e1ae7869 Mon Sep 17 00:00:00 2001
From: William Pursell <address@hidden>
Date: Mon, 6 Oct 2008 20:27:35 +0100
Subject: [PATCH] Adding src/Makefile.am and src/doc/Makefile.am

---
 src/Makefile.am     |   84 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/doc/Makefile.am |    9 +++++
 2 files changed, 93 insertions(+), 0 deletions(-)
 create mode 100644 src/Makefile.am
 create mode 100644 src/doc/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..9b1e67d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,84 @@
+# Process this file with automake to produce Makefile.in
+
+SCREEN = screen-$(PACKAGE_VERSION)
+
+# TODO These should be AC_DEFINE'd in configure.ac
+ETCSCREENRC = $(sysconfdir)/screenrc
+SCREENENCODINGS = $(datadir)/screen/utf8encodings
+
+SUBDIRS = doc
+AM_CPPFLAGS = -DETCSCREENRC='"$(ETCSCREENRC)"' \
+           -DSCREENENCODINGS='"$(SCREENENCODINGS)"'
+
+
+#TODO  These should be AC_ARG_VAR'ed in cofigure.ac
+### Chose some debug configuration options:
+# -DDEBUG
+#      Turn on really heavy debug output. This is written to 
+#      /tmp/debug/{SCREEN,screen}.<pid>. Look at these files and quote 
+#      questionable sections when sending bug-reports to the author.
+# -DDUMPSHADOW
+#      With shadow-pw screen would never dump core. Use this option if
+#      you still want to have a core. Use only for debugging.
+OPTIONS=
+
+bin_PROGRAMS = screen
+screen.$(OBJEXT): osdef.h term.h comm.h
+screen_SOURCES = screen.c ansi.c fileio.c mark.c misc.c resize.c socket.c \
+       search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \
+       termcap.c input.c attacher.c pty.c process.c display.c comm.c \
+       kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \
+       sched.c teln.c nethack.c encoding.c \
+       acconfig.h acls.h ansi.h braille.h display.h extern.h \
+       image.h layer.h logfile.h mark.h os.h patchlevel.h \
+       sched.h screen.h window.h
+
+
+###############################################################################
+install_hook:
+       -if [ -d /usr/lib/terminfo ]; then \
+               PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
+               chmod 644 /usr/lib/terminfo/s/screen*; \
+       fi
+# Better do this by hand. E.g. under RCS...
+#      cat ${srcdir}/terminfo/screencap >> /etc/termcap
+       @echo "termcap entry (${srcdir}/terminfo/screencap) should be installed 
manually."
+       @echo "You may also want to install $(srcdir)/etc/etcscreenrc in" 
$(ETCSCREENRC)
+
+
+shadow:
+       mkdir shadow;
+       cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc 
../terminfo ../etc .
+       rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h
+       echo "install all Makefiles and config:" > shadow/Makefile
+       echo "  rm -f config.cache" >> shadow/Makefile
+       echo "  sh ./configure" >> shadow/Makefile
+       
+term.h: term.c term.sh
+       AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh
+
+kmapdef.c: term.h
+
+tty.c: tty.sh 
+       sh $(srcdir)/tty.sh tty.c
+
+comm.h: comm.c comm.sh config.h
+       AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
+
+osdef.h: osdef.sh config.h osdef.h.in
+       CPP="$(CPP) $(AM_CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
+
+docs:
+       cd doc; $(MAKE) dvi screen.info
+
+dvi info screen.info:
+       -cd doc; $(MAKE) $@
+
+EXTRA_DIST = term.sh tty.sh comm.sh osdef.sh osdef.h.in
+CLEANFILES = screen osdef0.c osdef1.sed osdef2.sed core
+DISTCLEANFILES = tty.c term.h comm.h osdef.h kmapdef.c
+
+utfdir = $(datarootdir)/screen/utf8encodings
+dist_utf_DATA = $(srcdir)/utf8encodings/??
+
+
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
new file mode 100644
index 0000000..eb58a23
--- /dev/null
+++ b/src/doc/Makefile.am
@@ -0,0 +1,9 @@
+
+info_TEXINFOS = screen.texinfo
+
+dist_man1_MANS = screen.1
+
+CLEANFILES =  *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr *.log *.aux 
*.toc *~
+
+DISTCLEANFILES = *.dvi
+
-- 
1.6.0.2.GIT

>From 81d742ae0ac45e69a22ae18b8deac30ce7d7430f Mon Sep 17 00:00:00 2001
From: William Pursell <address@hidden>
Date: Mon, 6 Oct 2008 20:28:25 +0100
Subject: [PATCH] Added autogenerated files to .gitignore.

---
 src/.gitignore |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/.gitignore b/src/.gitignore
index 529960c..581cebd 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,6 +3,8 @@
 \#*\#
 *~
 Makefile
+Makefile.in
+aclocal.m4
 autom4te.cache
 cscope.out
 TAGS
@@ -19,3 +21,10 @@ term.h
 screen
 stamp-h.in
 tty.c
+screen*.tar.gz
+.deps/
+depcomp
+install-sh
+missing
+stamp-h1
+texinfo.tex
-- 
1.6.0.2.GIT

>From 5f4131e5a6443a7eadd151c4bbabde21e1ad0abb Mon Sep 17 00:00:00 2001
From: William Pursell <address@hidden>
Date: Mon, 6 Oct 2008 20:29:21 +0100
Subject: [PATCH] Removed install.sh.

This file is obsolete, and install-sh is current.
Rather that including it in the repository, it
seems more appropriate to add --install to
autoreconf to ensure we always have the up-to-date
version.
---
 src/install.sh |  119 --------------------------------------------------------
 1 files changed, 0 insertions(+), 119 deletions(-)
 delete mode 100755 src/install.sh

diff --git a/src/install.sh b/src/install.sh
deleted file mode 100755
index 8c07c50..0000000
--- a/src/install.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-       -c) instcmd="$cpprog"
-           shift
-           continue;;
-
-       -m) chmodcmd="$chmodprog $2"
-           shift
-           shift
-           continue;;
-
-       -o) chowncmd="$chownprog $2"
-           shift
-           shift
-           continue;;
-
-       -g) chgrpcmd="$chgrpprog $2"
-           shift
-           shift
-           continue;;
-
-       -s) stripcmd="$stripprog"
-           shift
-           continue;;
-
-       *)  if [ x"$src" = x ]
-           then
-               src=$1
-           else
-               dst=$1
-           fi
-           shift
-           continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-       echo "install:  no input file specified"
-       exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-       echo "install:  no destination specified"
-       exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-       dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0
-- 
1.6.0.2.GIT

>From f73bc6380680931b85ed02fa27fbd1b1f2ee8074 Mon Sep 17 00:00:00 2001
From: William Pursell <address@hidden>
Date: Mon, 6 Oct 2008 20:30:03 +0100
Subject: [PATCH] Add --verbose --install to autoreconf.

We need --install for install-sh, and --verbose
seems to me to be a good thing.
---
 src/autogen.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/autogen.sh b/src/autogen.sh
index 520249c..c5a81c1 100755
--- a/src/autogen.sh
+++ b/src/autogen.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec autoreconf
+exec autoreconf --verbose --install
-- 
1.6.0.2.GIT

>From fdaa754dc7626bf34124fad15af9fd3a23986cad Mon Sep 17 00:00:00 2001
From: William Pursell <address@hidden>
Date: Mon, 6 Oct 2008 20:35:31 +0100
Subject: [PATCH] Fix paths in configure.ac.

I had initially planned to put configure.ac in
the toplevel directory to make it easier to
add a test suite in a sibling directory, and
had written configure.ac to reflect that
tree structure.  It seems best to hold
off on that.
---
 src/configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/configure.ac b/src/configure.ac
index fef1130..dac1d33 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1276,7 +1276,7 @@ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet 
-lnsl -lsec -lseq"
 
 AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal 
error. Sorry.))
 
-AC_CONFIG_FILES([ Makefile src/Makefile src/doc/Makefile])
+AC_CONFIG_FILES([ Makefile doc/Makefile])
 AC_OUTPUT
 
 for i in term.sh tty.sh comm.sh osdef.sh; do
-- 
1.6.0.2.GIT