Loads of build chain fixups from Sebastian

* merges:
  cosmetics, list Installation and cpuid in distclean-local hook
  fix, comb out double-/ hiccups in invocation-{name,directory}
  chore, bldchn, remove dump file upon make uninstall
  chore, major, do not include dump id in dump file name
  Summary: minor, bring back dist targets Keywords: bldchn dist doc
  doc, fix, do not use structure (@unnumberedsec) inside @enumerate
  chore, mention src/sxemacs in gitignore fully qualified
  doc, fix, do not use @heading in @enumerate
  chore, list ALL texi files in info/ and subdirs
  fix, do not use @anchor in structuring commands
  chore, remove TEXI2DVI redefinitions
  chore, mention build chain .el files in lisp's Makefile.am
  chore, mention headers needed for the ase-set emod
  chore, move systty.h to src/ui/TTY/
  chore, put sxe-utils.h into distribution
  chore, remove VPATH fiddling from sxe-srctree.m4
  chore, don't mention non-existing files in Makefile.am's
  chore, name ase-resclass-test.el correctly
  chore, don't mention non-existing files in Makefile.am's

diff --git a/.gitignore b/.gitignore
index 1c693b5..6275726 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -73,8 +73,8 @@ config.values
 DOC
 dump-id.c
 sheap-adjust.h
-sxemacs
-sxemacs.dmp
+src/sxemacs
+src/sxemacs.dmp
 Emacs.ad.h
 ctags2
 etags

diff --git a/Makefile.am b/Makefile.am
index a5d3e0e..120c74f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,10 @@ uninstall-hook:
 
 check-recursive: all-recursive
 
+distclean-local:
+       $(RM) $(builddir)/Installation
+       $(RM) $(builddir)/cpuid
+
 $(ETAGS):
        cd $(top_builddir)/lib-src
        $(MAKE) $(AM_MAKEFLAGS) etags
@@ -162,9 +166,3 @@ stage2: stage1
 ### dont use staged build
 ##all: stage1 stage2
 
-
-distdir: dist-hook
-
-dist-hook:
-       @echo "The dist targets do not work. Please read the sppm info section 'Making releases'."
-       @exit 1

diff --git a/info/Makefile.am b/info/Makefile.am
index 8ccc71e..7449556 100644 (file)
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -25,10 +25,146 @@
 LANG=C
 LC_ALL=C
 
-info_TEXINFOS = cl.texi custom.texi emodules.texi sppm.texi            \
-       external-widget.texi sxemacs-faq.texi term.texi widget.texi     \
-       lispref/lispref.texi internals/internals.texi                   \
-       sxemacs/sxemacs.texi new-users-guide/new-users-guide.texi
+info_TEXINFOS =
+info_TEXINFOS += cl.texi
+info_TEXINFOS += custom.texi
+info_TEXINFOS += emodules.texi
+info_TEXINFOS += external-widget.texi
+info_TEXINFOS += internals/internals.texi
+info_TEXINFOS += lispref/lispref.texi
+info_TEXINFOS += new-users-guide/new-users-guide.texi
+info_TEXINFOS += sppm.texi
+info_TEXINFOS += sxemacs-faq.texi
+info_TEXINFOS += sxemacs/sxemacs.texi
+info_TEXINFOS += term.texi
+info_TEXINFOS += widget.texi
 
-TEXI2DVI_TEX = latex
-TEXI2DVI = TEX=$(TEXI2DVI_TEX) texi2dvi -c -s
+internals_internals_TEXINFOS =
+internals_internals_TEXINFOS += internals/index.texi
+
+lispref_lispref_TEXINFOS =
+lispref_lispref_TEXINFOS += lispref/abbrevs.texi
+lispref_lispref_TEXINFOS += lispref/annotations.texi
+lispref_lispref_TEXINFOS += lispref/back.texi
+lispref_lispref_TEXINFOS += lispref/backups.texi
+lispref_lispref_TEXINFOS += lispref/buffers.texi
+lispref_lispref_TEXINFOS += lispref/building.texi
+lispref_lispref_TEXINFOS += lispref/commands.texi
+lispref_lispref_TEXINFOS += lispref/compile.texi
+lispref_lispref_TEXINFOS += lispref/consoles-devices.texi
+lispref_lispref_TEXINFOS += lispref/control.texi
+lispref_lispref_TEXINFOS += lispref/customize.texi
+lispref_lispref_TEXINFOS += lispref/databases.texi
+lispref_lispref_TEXINFOS += lispref/debugging.texi
+lispref_lispref_TEXINFOS += lispref/dialog.texi
+lispref_lispref_TEXINFOS += lispref/display.texi
+lispref_lispref_TEXINFOS += lispref/dragndrop.texi
+lispref_lispref_TEXINFOS += lispref/edebug-inc.texi
+lispref_lispref_TEXINFOS += lispref/edebug.texi
+lispref_lispref_TEXINFOS += lispref/ent.texi
+lispref_lispref_TEXINFOS += lispref/errors.texi
+lispref_lispref_TEXINFOS += lispref/eval.texi
+lispref_lispref_TEXINFOS += lispref/extents.texi
+lispref_lispref_TEXINFOS += lispref/faces.texi
+lispref_lispref_TEXINFOS += lispref/ffi.texi
+lispref_lispref_TEXINFOS += lispref/files.texi
+lispref_lispref_TEXINFOS += lispref/frames.texi
+lispref_lispref_TEXINFOS += lispref/functions.texi
+lispref_lispref_TEXINFOS += lispref/glyphs.texi
+lispref_lispref_TEXINFOS += lispref/gutter.texi
+lispref_lispref_TEXINFOS += lispref/hash-tables.texi
+lispref_lispref_TEXINFOS += lispref/help.texi
+lispref_lispref_TEXINFOS += lispref/hooks.texi
+lispref_lispref_TEXINFOS += lispref/index.texi
+lispref_lispref_TEXINFOS += lispref/internationalization.texi
+lispref_lispref_TEXINFOS += lispref/intro.texi
+lispref_lispref_TEXINFOS += lispref/keymaps.texi
+lispref_lispref_TEXINFOS += lispref/ldap.texi
+lispref_lispref_TEXINFOS += lispref/lists.texi
+lispref_lispref_TEXINFOS += lispref/loading.texi
+lispref_lispref_TEXINFOS += lispref/locals.texi
+lispref_lispref_TEXINFOS += lispref/macros.texi
+lispref_lispref_TEXINFOS += lispref/maps.texi
+lispref_lispref_TEXINFOS += lispref/markers.texi
+lispref_lispref_TEXINFOS += lispref/media.texi
+lispref_lispref_TEXINFOS += lispref/menus.texi
+lispref_lispref_TEXINFOS += lispref/minibuf.texi
+lispref_lispref_TEXINFOS += lispref/modes.texi
+lispref_lispref_TEXINFOS += lispref/mouse.texi
+lispref_lispref_TEXINFOS += lispref/mule.texi
+lispref_lispref_TEXINFOS += lispref/numbers.texi
+lispref_lispref_TEXINFOS += lispref/objects.texi
+lispref_lispref_TEXINFOS += lispref/openssl.texi
+lispref_lispref_TEXINFOS += lispref/os.texi
+lispref_lispref_TEXINFOS += lispref/packaging.texi
+lispref_lispref_TEXINFOS += lispref/positions.texi
+lispref_lispref_TEXINFOS += lispref/postgresql.texi
+lispref_lispref_TEXINFOS += lispref/processes.texi
+lispref_lispref_TEXINFOS += lispref/range-tables.texi
+lispref_lispref_TEXINFOS += lispref/scrollbars.texi
+lispref_lispref_TEXINFOS += lispref/searching.texi
+lispref_lispref_TEXINFOS += lispref/sequences.texi
+lispref_lispref_TEXINFOS += lispref/specifiers.texi
+lispref_lispref_TEXINFOS += lispref/streams.texi
+lispref_lispref_TEXINFOS += lispref/strings.texi
+lispref_lispref_TEXINFOS += lispref/symbols.texi
+lispref_lispref_TEXINFOS += lispref/syntax.texi
+lispref_lispref_TEXINFOS += lispref/text.texi
+lispref_lispref_TEXINFOS += lispref/tips.texi
+lispref_lispref_TEXINFOS += lispref/toolbar.texi
+lispref_lispref_TEXINFOS += lispref/variables.texi
+lispref_lispref_TEXINFOS += lispref/windows.texi
+lispref_lispref_TEXINFOS += lispref/x-windows.texi
+
+new_users_guide_new_users_guide_TEXINFOS =
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/custom1.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/custom2.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/edit.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/enter.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/files.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/help.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/modes.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/region.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/search.texi
+new_users_guide_new_users_guide_TEXINFOS += new-users-guide/xmenu.texi
+
+sxemacs_sxemacs_TEXINFOS =
+sxemacs_sxemacs_TEXINFOS += sxemacs/abbrevs.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/basic.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/buffers.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/building.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/calendar.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/cmdargs.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/custom.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/display.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/entering.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/files.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/fixit.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/frame.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/glossary.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/gpl.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/help.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/indent.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/keystrokes.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/killing.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/m-x.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/major.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/mark.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/menus.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/mini.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/misc.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/mouse.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/mule.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/new.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/packages.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/picture.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/programs.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/reading.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/regs.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/search.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/sending.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/startup.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/text.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/trouble.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/undo.texi
+sxemacs_sxemacs_TEXINFOS += sxemacs/windows.texi

diff --git a/info/lispref/intro.texi b/info/lispref/intro.texi
index 7b3b1e6..1719d85 100644 (file)
--- a/info/lispref/intro.texi
+++ b/info/lispref/intro.texi
@@ -292,12 +292,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
 @center NO WARRANTY
-@end ifinfo
 
 @item
 BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY

diff --git a/info/sppm.texi b/info/sppm.texi
index 84e6890..73f7904 100644 (file)
--- a/info/sppm.texi
+++ b/info/sppm.texi
@@ -1024,8 +1024,9 @@ accessible repo, @dfn{myremote}.
 If your repos is private, it is safe to skip the push and just advance
 to the next step.
 
-@subheading @anchor{Patch Submission}Patch Submission
+@subheading Patch Submission
 
+@anchor{Patch Submission}
 At this point, your changes are ready for @s{} to be incorporated into
 the main SXEmacs code base.  All you need to do is let him know, and
 you can easily do that with the following 2 git commands:
@@ -1559,8 +1560,9 @@ git push myremote master
 @end smallexample
 
 
-@subheading @anchor{Automation}Automation
+@subheading Automation
 
+@anchor{Automation}
 The last two commands for patch submission listed in @xref{Patch
 Submission}, @code{format-patch} and @code{send-email} are fairly long
 and hairy.  You'd no doubt have trouble remembering them.  But, never
@@ -1618,8 +1620,9 @@ sent to sxemacs-patches; this includes instances where you merely
 are pulling the latest from mainline and mirroring. Hence, the use of
 aliases as discussed below may be preferable.
 
-@subsection @anchor{Automating with Aliases}Automating with Aliases
+@subsection Automating with Aliases
 
+@anchor{Automating with Aliases}
 Git allows you to define aliases that will let you do all kinds of
 funky things.  Remember those hairy @code{format-patch} and
 @code{send-email} commands?

diff --git a/info/sxemacs/new.texi b/info/sxemacs/new.texi
index eb84975..47d5781 100644 (file)
--- a/info/sxemacs/new.texi
+++ b/info/sxemacs/new.texi
@@ -122,7 +122,7 @@ environment to set your preferences for color, fonts, location, and the size
 of XEmacs frames.  Refer to your X documentation for more information
 about resources.
 
-@unnumberedsec New Commands and Variables
+@b{New Commands and Variables}
 
 There are many new functions in XEmacs, and many existing functions
 whose semantics have been expanded.  Most of these are only of interest

diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
index 80dbd31..1bdf0cc 100644 (file)
--- a/lib-src/Makefile.am
+++ b/lib-src/Makefile.am
@@ -59,7 +59,6 @@ bin_PROGRAMS = gnuclient etags ctags2 ootags
 archlib_PROGRAMS = gnuserv fakemail wakeup profile make-docfile \
        sorted-doc movemail yow hexl mmencode
 noinst_PROGRAMS = make-path make-dump-id
-dist_noinst_SCRIPTS = ad2c
 
 ## how do we create
 gnuclient_SOURCES = gnuserv.h gnuslib.c gnuclient.c

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index 66f7129..e3a3bbd 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -63,7 +63,6 @@ sitepkg_DATA =
 
 subdirs = ffi mule term
 
-EXTRA_DIST = ffi/Makefile.in mule/Makefile.in
 nocompile_bldchainels =                                                        \
        build-autoloads.el compile-core.el loadup-el.el loadup.el       \
        site-load.el update-elc.el update-elc-2.el very-early-lisp.el
@@ -164,6 +163,8 @@ nobase_dist_lisp_DATA = $(elfiles)
 nobase_lisp_DATA = $(builtels) $(elfiles:.el=.elc) $(builtels:.el=.elc)
 noinst_DATA = auto.stamp update-elc.stamp autoc.stamp
 
+EXTRA_DIST = $(nocompile_bldchainels) $(compile_bldchainels)
+
 BUILT_FILES = auto.stamp update-elc.stamp autoc.stamp
 
 CLEANFILES = core* stage1 stage2 $(builtels) $(builtels:.el=.elc)      \
@@ -264,3 +265,5 @@ auto.stamp: $(SXEMACS) $(compile_elfiles)
 #      @touch $@
 #
 #all: stage1 stage2
+
+.NOTPARALLEL:

diff --git a/m4/sxe-srctree.m4 b/m4/sxe-srctree.m4
index 467ed56..019eeed 100644 (file)
--- a/m4/sxe-srctree.m4
+++ b/m4/sxe-srctree.m4
@@ -67,13 +67,6 @@ AC_DEFUN([SXE_CHECK_SRCDIR_HEALTH], [dnl
                AC_MSG_WARN([use GNU make.  If you do not have GNU make, then you must])
                AC_MSG_WARN([now do `make distclean' in $sxe_srcdir,])
                AC_MSG_WARN([and then run $progbasename again.])
-               extrasub="/^VPATH[[      ]]*=/c\
-vpath %.c $sxe_srcdir/lib-src $sxe_srcdir/src\\n\
-vpath %.h $sxe_srcdir/lib-src $sxe_srcdir/src\\n\
-vpath %.y $sxe_srcdir/lib-src $sxe_srcdir/src\\n\
-vpath %.l $sxe_srcdir/lib-src $sxe_srcdir/src\\n\
-vpath %.s $sxe_srcdir/lib-src $sxe_srcdir/src\\n\
-vpath %.in $sxe_srcdir/lib-src $sxe_srcdir/src\\n"
        fi
 
 ])dnl SXE_CHECK_SRCDIR_HEALTH

diff --git a/modules/ase/Makefile.am b/modules/ase/Makefile.am
index aada462..33df73c 100644 (file)
--- a/modules/ase/Makefile.am
+++ b/modules/ase/Makefile.am
@@ -77,8 +77,11 @@ nodist_ase_la_SOURCES = ase.doc.c
 BUILT_SOURCES += ase.doc.c
 
 module_LTLIBRARIES += ase-set.la
-ase_set_la_SOURCES = ase-set.c                                         \
-       ase-cartesian.c ase-interval.c ase-metric.c ase-neighbourhood.c
+ase_set_la_SOURCES = ase-set.c ase-set.h
+ase_set_la_SOURCES += ase-cartesian.c ase-cartesian.h
+ase_set_la_SOURCES += ase-interval.c ase-interval.h
+ase_set_la_SOURCES += ase-metric.c ase-metric.h
+ase_set_la_SOURCES += ase-neighbourhood.c ase-neighbourhood.h
 nodist_ase_set_la_SOURCES = ase-set.doc.c                              \
        ase-cartesian.doc.c ase-interval.doc.c ase-metric.doc.c         \
        ase-neighbourhood.doc.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b30b98..e00943a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,7 +144,8 @@ noinst_LIBRARIES = $(noinst_pdumplibs) $(noinst_nodumplibs)
 acgen_headers = config.h sxe-paths.h
 header_HEADERS = $(acgen_headers)              \
        $(libsxecore_a_headers)                 \
-       emodules-ng.h
+       emodules-ng.h                           \
+       sxe-utils.h
 
 sheader_HEADERS = $(srcdir)/s/*.h
 mheader_HEADERS = $(srcdir)/m/*.h
@@ -321,7 +322,7 @@ config.values: config.h
 ## one day (when SXE is linked with its own shared libraries) we HAVE to
 ## go that way but at the moment it's okay the way it is
 SXE_SHOW_DUMP = $$($(BITCHENV) $(DESTDIR)$(bindir)/sxemacs -sd)
-SXEDMP_FILENAME=sxemacs-$(old_version)-$(SXE_SHOW_DUMP).dmp
+SXEDMP_FILENAME=sxemacs-$(old_version).dmp
 
 sxemacs.dmp: $(SXEMACS) $(archlib_DATA) $(bldlispdir)/update-elc.stamp
        if test -e "$(bldlispdir)/update-elc.stamp"; then \
@@ -354,6 +355,9 @@ install-exec-hook:
                -l $(sxelispdir)/loadup.el \
                --dump $(DESTDIR)$(archlibdir)/$(SXEDMP_FILENAME))
 
+uninstall-hook:
+       (cd $(DESTDIR)$(archlibdir) && $(RM) $(SXEDMP_FILENAME))
+
 
 ## someone who wants to use this actually needs repeat the fuss above
 sxemacs.dmp.gdb: $(SXEMACS) $(AALFILE) \

diff --git a/src/callproc.c b/src/callproc.c
index 10d86eb..c652f17 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "sysproc.h"
 #include "sysfile.h"           /* Always include after sysproc.h */
 #include "syssignal.h"         /* Always include before systty.h */
-#include "ui/systty.h"
+#include "ui/TTY/systty.h"
 
 
 

diff --git a/src/emacs.c b/src/emacs.c
index 07dd461..0aaffd8 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -174,7 +174,7 @@ version 18.59 released October 31, 1992.
 #include "sysdep.h"
 
 #include "syssignal.h"         /* Always include before systty.h */
-#include "ui/systty.h"
+#include "ui/TTY/systty.h"
 #include "sysfile.h"
 #include "systime.h"
 
@@ -2237,6 +2237,16 @@ DOESNT_RETURN main_1(int argc, char **argv, char **envp, int restart)
                if (NILP(Vinvocation_directory))
                        Vinvocation_directory = Vinvocation_name;
 
+               /* kick double /s as we want a standard posix name */
+               for (unsigned char *p = XSTRING_DATA(Vinvocation_name),
+                            *q = p; ((*q = *p));) {
+                       if (*q++ == '/') {
+                               while (*++p == '/');
+                       } else {
+                               p++;
+                       }
+               }
+
                Vinvocation_name =
                    Ffile_name_nondirectory(Vinvocation_directory);
                Vinvocation_directory =

diff --git a/src/process-unix.c b/src/process-unix.c
index b3e00db..2c20d30 100644 (file)
--- a/src/process-unix.c
+++ b/src/process-unix.c
@@ -57,7 +57,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "sysproc.h"
 #include "systime.h"
 #include "syssignal.h"         /* Always include before systty.h */
-#include "ui/systty.h"
+#include "ui/TTY/systty.h"
 #include "syswait.h"
 
 #ifdef HPUX

diff --git a/src/process.c b/src/process.c
index 1a64736..75986e4 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "sysproc.h"
 #include "systime.h"
 #include "syssignal.h"         /* Always include before systty.h */
-#include "ui/systty.h"
+#include "ui/TTY/systty.h"
 #include "syswait.h"
 
 #if defined(HAVE_OPENSSL) && defined(OPENSSL_SSL)

diff --git a/src/sysdep.c b/src/sysdep.c
index 5e3b447..3c923c6 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -41,10 +41,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "ui/TTY/console-tty.h" /* for stuff in stuff_char and
                                   others. Seriously in need of
                                   refactoring... */
-#else
-#include "syssignal.h"
-#include "ui/systty.h"
-#endif                         /* HAVE_TTY */
+#else  /* !HAVE_TTY */
+#include "syssignal.h"         /* always include before systty.h */
+#include "ui/TTY/systty.h"
+#endif  /* HAVE_TTY */
 
 #include "ui/console-stream.h"
 

diff --git a/src/ui/TTY/Makefile.am b/src/ui/TTY/Makefile.am
index 30be50f..12a262f 100644 (file)
--- a/src/ui/TTY/Makefile.am
+++ b/src/ui/TTY/Makefile.am
@@ -50,7 +50,8 @@ noinst_LIBRARIES=
 header_HEADERS=$(acgen_headers)
 
 libsxeuiTTY_a_headers = \
-       cm.h console-tty.h objects-tty.h systty.h gpmevent.h
+       cm.h console-tty.h objects-tty.h gpmevent.h
+libsxeuiTTY_a_headers += systty.h
 libsxeuiTTY_a_sources =                                                \
        cm.c console-tty.c device-tty.c event-tty.c frame-tty.c         \
        objects-tty.c redisplay-tty.c

diff --git a/src/ui/TTY/console-tty.h b/src/ui/TTY/console-tty.h
index 3b3d57e..707881f 100644 (file)
--- a/src/ui/TTY/console-tty.h
+++ b/src/ui/TTY/console-tty.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include "ui/console.h"
 #include "syssignal.h"         /* Always include before systty.h */
-#include "ui/systty.h"
+#include "systty.h"
 
 DECLARE_CONSOLE_TYPE(tty);
 

diff --git a/src/ui/systty.h b/src/ui/TTY/systty.h
similarity index 100%
rename from src/ui/systty.h
rename to src/ui/TTY/systty.h

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8dcc40c..b511101 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,7 +49,7 @@ automated_tests = automated/ase-cartesian-tests.el                      \
        automated/ase-interval-tests.el automated/ase-metric-tests.el   \
        automated/ase-neighbourhood-tests.el                            \
        automated/ase-permutation-tests.el                              \
-       automated/ase-reclass-tests.el automated/base64-tests.el        \
+       automated/ase-resclass-tests.el automated/base64-tests.el       \
        automated/bloom-tests.el automated/byte-compiler-tests.el       \
        automated/case-tests.el automated/ccl-tests.el                  \
        automated/cl-loop-tests.el automated/c-tests.el                 \