From xemacs-m  Sun Apr  6 13:02:38 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id NAA01426
	for <xemacs-beta@xemacs.org>; Sun, 6 Apr 1997 13:02:37 -0500 (CDT)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id LAA04689;
	Sun, 6 Apr 1997 11:15:30 -0700
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Re: xemacs-20.1b11 failure without CANNA/WNN
References: <199704061637.SAA12023@sol1.cybernet-ag.net>
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
In-Reply-To: Axel Seibert's message of Sun, 6 Apr 1997 18:37:55 +0200 (MET DST)
Mime-Version: 1.0 (generated by tm-edit 7.106)
Content-Type: text/plain; charset=US-ASCII
Date: 06 Apr 1997 11:15:29 -0700
Message-ID: <m2zpvcdnlq.fsf@altair.xemacs.org>
Lines: 228
X-Mailer: Gnus v5.4.40/XEmacs 20.1(beta12)

(Will people please *stop* Cc'ing me on email to this list.)

This has got other cleanup mixed in.  It shouldn't hurt.

Index: src/Makefile.in.in
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/src/Makefile.in.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in.in
--- Makefile.in.in	1997/04/05 18:08:28	1.15
+++ Makefile.in.in	1997/04/06 18:09:20
@@ -465,12 +465,6 @@
 	  LD_SWITCH_X_SYSTEM LD_SWITCH_MACHINE \
 	  -L. $(LIBX11_LDFLAGS) ENERGIZE_LDFLAGS XILDOFF NO_GNU_LINKER
 
-#ifdef HAVE_NEXTSTEP
-.SUFFIXES: .m
-.m.o:
-	$(CC) -c $(ALL_CFLAGS) $<
-#endif
-
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $<
 
@@ -541,12 +535,6 @@
 #define XMU_OBJS xmu.o
 #endif
 
-#ifdef EPOCH
-#define EPOCH_OBJS epoch.o
-#else
-#define EPOCH_OBJS
-#endif
-
 #ifdef MULE
 
 /* We ignore mule-mcpath.o for the moment. */
@@ -656,36 +644,50 @@
 #else
 # define XOBJS
 # define XMU_OBJS
-# define EPOCH_OBJS
-#endif /* HAVE_X_WINDOWS */
+/* We should be able to deal with Canna and Wnn in tty mode once MULE is */
+/* ported to tty, right? */
+/* This is cloned from the above. */
+#ifdef MULE
 
-#ifdef HAVE_NEXTSTEP
-#ifdef HAVE_TOOLBARS
-#define TOOLBAR_NS_OBJS toolbar-ns.o
-#else
-#define TOOLBAR_NS_OBJS
-#endif
-#ifdef HAVE_MENUBARS
-#define MENUBAR_NS_OBJS menubar-ns.o
-#else
-#define MENUBAR_NS_OBJS
-#endif
-#ifdef HAVE_SCROLLBARS
-#define SCROLLBAR_NS_OBJS scrollbar-ns.o
-#else
-#define SCROLLBAR_NS_OBJS
-#endif
-#ifdef HAVE_DIALOGS
-#define DIALOG_NS_OBJS dialog-ns.o
-#else
-#define DIALOG_NS_OBJS
-#endif
-#define NSOBJS console-ns.o device-ns.o DIALOG_NS_OBJS event-ns.o frame-ns.o \
-	       glyphs-ns.o MENUBAR_NS_OBJS nsselect.o objects-ns.o \
-	       redisplay-ns.o SCROLLBAR_NS_OBJS TOOLBAR_NS_OBJS
-#else
-# define NSOBJS
-#endif /* HAVE_NEXTSTEP */
+/* We ignore mule-mcpath.o for the moment. */
+
+# ifdef HAVE_CANNA
+#  define CANNA_OBJS mule-canna.o
+#  define CANNA_OBJ_SRC ${muledirfromsrc}/mule-canna.c
+#  define LIB_CANNA -lcanna -lRKC
+# else
+#  define CANNA_OBJS
+#  define CANNA_OBJ_SRC
+#  define LIB_CANNA
+# endif
+# ifdef HAVE_WNN
+#  define WNN_OBJS mule-wnnfns.o
+#  define WNN_OBJ_SRC ${muledirfromsrc}/mule-wnnfns.c
+#  define LIB_WNN -lwnn
+# else
+#  define WNN_OBJS
+#  define WNN_OBJ_SRC
+#  define LIB_WNN
+# endif
+/* Chuck says that you have to have at least one specified actual
+   object file per line. */
+mule_objs=	mule.o mule-ccl.o CANNA_OBJS \
+		WNN_OBJS mule-charset.o mule-coding.o
+mule_obj_src=	${muledirfromsrc}/mule.c \
+		${muledirfromsrc}/mule-ccl.c CANNA_OBJ_SRC \
+		WNN_OBJ_SRC ${muledirfromsrc}/mule-charset.c \
+		${muledirfromsrc}/mule-coding.c
+
+#else /* not MULE */
+
+mule_objs=
+mule_obj_src=
+#define LIB_CANNA
+#define LIB_WNN
+
+#endif /* not MULE */
+
+#endif /* HAVE_X_WINDOWS */
 
 #ifndef ORDINARY_LINK
 /* Fix linking if compiled with GCC.  */
@@ -905,7 +907,7 @@
 	cmds.o console.o console-stream.o \
 	data.o DATABASE_OBJS DEBUG_OBJS device.o DIALOG_OBJS dired.o doc.o \
 	doprnt.o dynarr.o \
-	editfns.o elhash.o emacs.o ENERGIZE_OBJS EPOCH_OBJS eval.o events.o \
+	editfns.o elhash.o emacs.o ENERGIZE_OBJS eval.o events.o \
 	event-stream.o EVENT_UNIXOID_OBJS extents.o \
 	faces.o fileio.o filelock.o filemode.o floatfns.o fns.o font-lock.o \
 	frame.o \
@@ -915,7 +917,7 @@
 	keymap.o $(RTC_PATCH_O) \
 	lread.o lstream.o \
 	macros.o marker.o md5.o MENUBAR_OBJS minibuf.o MOCKLISPOBJS \
-	NAS_OBJS NSOBJS \
+	NAS_OBJS \
 	objects.o opaque.o \
 	print.o process.o profile.o pure.o \
 	rangetab.o REALPATH_OBJS redisplay.o redisplay-output.o regex.o \
@@ -1085,15 +1087,8 @@
 #define X11_LISP
 #endif
 
-#ifdef HAVE_NEXTSTEP
-/* lisp files preloaded if compiled with support for NeXTstep */
-#define NS_LISP 
-#else
-#define NS_LISP
-#endif
-
 #ifdef HAVE_TTY
-/* lisp files preloaded if compiled with support for NeXTstep */
+/* lisp files preloaded if compiled with support for tty */
 #define TTY_LISP ${lispdir}term/tty-init.elc
 #else
 #define TTY_LISP
@@ -1132,12 +1127,6 @@
 #define NOMULE_LISP ${lispdir}prim/files-nomule.elc
 #endif
 
-#ifdef EPOCH
-#define EPOCH_LISP ${lispdir}epoch/epoch.elc
-#else
-#define EPOCH_LISP
-#endif
-
 #ifdef ENERGIZE
 /* Lisp files preloaded if compiled with support for Energize */
 #define ENERGIZE_LISP \
@@ -1270,7 +1259,7 @@
 	${lispdir}packages/vc-hooks.elc \
         ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc \
         ${lispdir}modes/auto-show.elc SUNPRO_LISP TTY_LISP \
-        ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP EPOCH_LISP \
+        ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP \
         ${lispdir}prim/itimer.elc ${lispdir}prim/itimer-autosave.elc \
 	${lispdir}ediff/ediff-hook.elc \
 	${lispdir}custom/widget.elc \
@@ -1278,7 +1267,7 @@
 	${lispdir}packages/fontl-hooks.elc SCROLLBAR_LISP \
 	${lispdir}prim/buffer.elc MENUBAR_LISP \
 	${lispdir}packages/buff-menu.elc DIALOG_LISP MULE_LISP NOMULE_LISP \
-	${lispdir}modes/abbrev.elc X11_LISP NS_LISP ENERGIZE_LISP TOOLTALK_LISP
+	${lispdir}modes/abbrev.elc X11_LISP ENERGIZE_LISP TOOLTALK_LISP
 
 /* Other Lisp files that are not dumped out but where it is convenient
    (or required?) for them to be byte-compiled early, before xemacs is
@@ -1758,7 +1747,7 @@
 /* The rule for the [sm] files has to be written a little funny to
    avoid looking like a C comment to CPP. */
 SOURCES = *.[chm] *.pswm [sm]/?* COPYING paths.h.in Makefile.in.in \
-	config.h.in README COPYING ChangeLog vms.pp-trans
+	config.h.in README COPYING ChangeLog
 unlock:
 	chmod u+w $(SOURCES)
 
@@ -2505,23 +2494,6 @@
 emacs.o: systime.h
 emacs.o: systty.h
 energize.o: config.h
-epoch.o: blocktype.h
-epoch.o: config.h
-epoch.o: conslots.h
-epoch.o: console-x.h
-epoch.o: console.h
-epoch.o: device.h
-epoch.o: dynarr.h
-epoch.o: events.h
-epoch.o: frame.h
-epoch.o: frameslots.h
-epoch.o: objects-x.h
-epoch.o: objects.h
-epoch.o: scrollbar.h
-epoch.o: specifier.h
-epoch.o: systime.h
-epoch.o: toolbar.h
-epoch.o: xintrinsic.h
 eval.o: backtrace.h
 eval.o: blocktype.h
 eval.o: buffer.h
@@ -3616,7 +3588,6 @@
 vm-limit.o: config.h
 vm-limit.o: dynarr.h
 vm-limit.o: mem-limits.h
-vmsproc.o: vmsproc.h
 window.o: blocktype.h
 window.o: buffer.h
 window.o: bufslots.h

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

