* Changed motif back to xm.

git-svn-id: svn://svn.zoy.org/elk/trunk@78 55e467fa-43c5-0310-a8a2-de718669efc6

configure.ac

@@ -409,7 +409,7 @@ AC_OUTPUT([
   lib/xlib/Makefile
   lib/xwidgets/Makefile
   lib/xwidgets/xaw/Makefile
-  lib/xwidgets/motif/Makefile
+  lib/xwidgets/xm/Makefile
   scm/Makefile
   scm/slib.scm
   src/Makefile

lib/xwidgets/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = xaw motif
+SUBDIRS = xaw xm
 
 NULL = 
 
@@ -6,17 +6,17 @@ include ../xlib/Include.am
 
 EXTRA_DIST = MISSING mkwidget.scm
 
-pkglib_LTLIBRARIES = xaw.la motif.la
+pkglib_LTLIBRARIES = xaw.la xm.la
 
 xaw_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
 xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
 xaw_la_LDFLAGS = -module -avoid-version
 xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
 
-motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
+xm_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
-motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
+xm_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
-motif_la_LDFLAGS = -module -avoid-version
+xm_la_LDFLAGS = -module -avoid-version
-motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+xm_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 extensions_HEADERS = xt.h
 extensionsdir = $(pkgincludedir)/extensions

lib/xwidgets/mkwidget.scm

@@ -24,13 +24,13 @@
     (set! type-name name)
     (format f "#include \"../xt.h\"~%")
     (case widget-set
-      (motif
+      (xm
 	(format f "#include <Xm/Xm.h>~%")))
     (if (and (not (eqv? include "")) (not (null? include)))
 	(begin
 	  (define dir)
 	  (case widget-set
-	    (motif
+	    (xm
 	     (set! dir "Xm"))
 	    (xaw
 	     (set! dir "X11/Xaw")))

lib/xwidgets/xm/Makefile.am

@@ -2,15 +2,15 @@ NULL =
 
 EXTRA_DIST = $(D_FILES)
 
-pkglib_LTLIBRARIES = motif-widgets.la
+pkglib_LTLIBRARIES = xm-widgets.la
 
-nodist_motif_widgets_la_SOURCES = $(C_FILES)
+nodist_xm_widgets_la_SOURCES = $(C_FILES)
-motif_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
+xm_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
-motif_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
+xm_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
-motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+xm_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 .d.c:
-	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ motif
+	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ xm
 
 clean: clean-local
 clean-local: