diff --git a/configure.ac b/configure.ac index d63a837..b926870 100644 --- a/configure.ac +++ b/configure.ac @@ -406,10 +406,10 @@ AC_OUTPUT([ lib/Makefile lib/misc/Makefile lib/unix/Makefile - lib/xaw/Makefile lib/xlib/Makefile - lib/xm/Makefile - lib/xt/Makefile + lib/xwidgets/Makefile + lib/xwidgets/xaw/Makefile + lib/xwidgets/motif/Makefile scm/Makefile scm/slib.scm src/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index cbdaf3b..d24fb43 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = misc unix xaw xlib xm xt +SUBDIRS = misc unix xlib xwidgets diff --git a/lib/xt/Include.am b/lib/xwidgets/Include.am similarity index 100% rename from lib/xt/Include.am rename to lib/xwidgets/Include.am diff --git a/lib/xt/MISSING b/lib/xwidgets/MISSING similarity index 100% rename from lib/xt/MISSING rename to lib/xwidgets/MISSING diff --git a/lib/xt/Makefile.am b/lib/xwidgets/Makefile.am similarity index 96% rename from lib/xt/Makefile.am rename to lib/xwidgets/Makefile.am index 199c7b0..de54433 100644 --- a/lib/xt/Makefile.am +++ b/lib/xwidgets/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = xaw motif + NULL = include ../xlib/Include.am diff --git a/lib/xt/accelerator.c b/lib/xwidgets/accelerator.c similarity index 100% rename from lib/xt/accelerator.c rename to lib/xwidgets/accelerator.c diff --git a/lib/xt/action.c b/lib/xwidgets/action.c similarity index 100% rename from lib/xt/action.c rename to lib/xwidgets/action.c diff --git a/lib/xt/callback.c b/lib/xwidgets/callback.c similarity index 100% rename from lib/xt/callback.c rename to lib/xwidgets/callback.c diff --git a/lib/xt/class.c b/lib/xwidgets/class.c similarity index 100% rename from lib/xt/class.c rename to lib/xwidgets/class.c diff --git a/lib/xt/classname.c b/lib/xwidgets/classname.c similarity index 100% rename from lib/xt/classname.c rename to lib/xwidgets/classname.c diff --git a/lib/xt/context.c b/lib/xwidgets/context.c similarity index 100% rename from lib/xt/context.c rename to lib/xwidgets/context.c diff --git a/lib/xt/converter.c b/lib/xwidgets/converter.c similarity index 100% rename from lib/xt/converter.c rename to lib/xwidgets/converter.c diff --git a/lib/xt/function.c b/lib/xwidgets/function.c similarity index 100% rename from lib/xt/function.c rename to lib/xwidgets/function.c diff --git a/lib/xt/identifier.c b/lib/xwidgets/identifier.c similarity index 100% rename from lib/xt/identifier.c rename to lib/xwidgets/identifier.c diff --git a/lib/xt/mkwidget.scm b/lib/xwidgets/mkwidget.scm similarity index 100% rename from lib/xt/mkwidget.scm rename to lib/xwidgets/mkwidget.scm diff --git a/lib/xm/ALIASES b/lib/xwidgets/motif/ALIASES similarity index 100% rename from lib/xm/ALIASES rename to lib/xwidgets/motif/ALIASES diff --git a/lib/xm/Makefile.am b/lib/xwidgets/motif/Makefile.am similarity index 100% rename from lib/xm/Makefile.am rename to lib/xwidgets/motif/Makefile.am diff --git a/lib/xm/arrow-button.d b/lib/xwidgets/motif/arrow-button.d similarity index 100% rename from lib/xm/arrow-button.d rename to lib/xwidgets/motif/arrow-button.d diff --git a/lib/xm/bulletin-brd.d b/lib/xwidgets/motif/bulletin-brd.d similarity index 100% rename from lib/xm/bulletin-brd.d rename to lib/xwidgets/motif/bulletin-brd.d diff --git a/lib/xm/cascade-btn.d b/lib/xwidgets/motif/cascade-btn.d similarity index 100% rename from lib/xm/cascade-btn.d rename to lib/xwidgets/motif/cascade-btn.d diff --git a/lib/xm/command.d b/lib/xwidgets/motif/command.d similarity index 100% rename from lib/xm/command.d rename to lib/xwidgets/motif/command.d diff --git a/lib/xm/drawing-area.d b/lib/xwidgets/motif/drawing-area.d similarity index 100% rename from lib/xm/drawing-area.d rename to lib/xwidgets/motif/drawing-area.d diff --git a/lib/xm/drawn-button.d b/lib/xwidgets/motif/drawn-button.d similarity index 100% rename from lib/xm/drawn-button.d rename to lib/xwidgets/motif/drawn-button.d diff --git a/lib/xm/file-selectn.d b/lib/xwidgets/motif/file-selectn.d similarity index 100% rename from lib/xm/file-selectn.d rename to lib/xwidgets/motif/file-selectn.d diff --git a/lib/xm/form.d b/lib/xwidgets/motif/form.d similarity index 100% rename from lib/xm/form.d rename to lib/xwidgets/motif/form.d diff --git a/lib/xm/frame.d b/lib/xwidgets/motif/frame.d similarity index 100% rename from lib/xm/frame.d rename to lib/xwidgets/motif/frame.d diff --git a/lib/xm/label.d b/lib/xwidgets/motif/label.d similarity index 100% rename from lib/xm/label.d rename to lib/xwidgets/motif/label.d diff --git a/lib/xm/list.d b/lib/xwidgets/motif/list.d similarity index 100% rename from lib/xm/list.d rename to lib/xwidgets/motif/list.d diff --git a/lib/xm/main-window.d b/lib/xwidgets/motif/main-window.d similarity index 100% rename from lib/xm/main-window.d rename to lib/xwidgets/motif/main-window.d diff --git a/lib/xm/message-box.d b/lib/xwidgets/motif/message-box.d similarity index 100% rename from lib/xm/message-box.d rename to lib/xwidgets/motif/message-box.d diff --git a/lib/xm/paned-window.d b/lib/xwidgets/motif/paned-window.d similarity index 100% rename from lib/xm/paned-window.d rename to lib/xwidgets/motif/paned-window.d diff --git a/lib/xm/push-button.d b/lib/xwidgets/motif/push-button.d similarity index 100% rename from lib/xm/push-button.d rename to lib/xwidgets/motif/push-button.d diff --git a/lib/xm/row-column.d b/lib/xwidgets/motif/row-column.d similarity index 100% rename from lib/xm/row-column.d rename to lib/xwidgets/motif/row-column.d diff --git a/lib/xm/scale.d b/lib/xwidgets/motif/scale.d similarity index 100% rename from lib/xm/scale.d rename to lib/xwidgets/motif/scale.d diff --git a/lib/xm/scroll-bar.d b/lib/xwidgets/motif/scroll-bar.d similarity index 100% rename from lib/xm/scroll-bar.d rename to lib/xwidgets/motif/scroll-bar.d diff --git a/lib/xm/scrolled-win.d b/lib/xwidgets/motif/scrolled-win.d similarity index 100% rename from lib/xm/scrolled-win.d rename to lib/xwidgets/motif/scrolled-win.d diff --git a/lib/xm/selectn-box.d b/lib/xwidgets/motif/selectn-box.d similarity index 100% rename from lib/xm/selectn-box.d rename to lib/xwidgets/motif/selectn-box.d diff --git a/lib/xm/separator.d b/lib/xwidgets/motif/separator.d similarity index 100% rename from lib/xm/separator.d rename to lib/xwidgets/motif/separator.d diff --git a/lib/xm/shell.d b/lib/xwidgets/motif/shell.d similarity index 100% rename from lib/xm/shell.d rename to lib/xwidgets/motif/shell.d diff --git a/lib/xm/support.d b/lib/xwidgets/motif/support.d similarity index 100% rename from lib/xm/support.d rename to lib/xwidgets/motif/support.d diff --git a/lib/xm/text.d b/lib/xwidgets/motif/text.d similarity index 100% rename from lib/xm/text.d rename to lib/xwidgets/motif/text.d diff --git a/lib/xm/toggle-btn.d b/lib/xwidgets/motif/toggle-btn.d similarity index 100% rename from lib/xm/toggle-btn.d rename to lib/xwidgets/motif/toggle-btn.d diff --git a/lib/xt/popup.c b/lib/xwidgets/popup.c similarity index 100% rename from lib/xt/popup.c rename to lib/xwidgets/popup.c diff --git a/lib/xt/resource.c b/lib/xwidgets/resource.c similarity index 100% rename from lib/xt/resource.c rename to lib/xwidgets/resource.c diff --git a/lib/xt/translation.c b/lib/xwidgets/translation.c similarity index 100% rename from lib/xt/translation.c rename to lib/xwidgets/translation.c diff --git a/lib/xt/widget.c b/lib/xwidgets/widget.c similarity index 100% rename from lib/xt/widget.c rename to lib/xwidgets/widget.c diff --git a/lib/xaw/ALIASES b/lib/xwidgets/xaw/ALIASES similarity index 100% rename from lib/xaw/ALIASES rename to lib/xwidgets/xaw/ALIASES diff --git a/lib/xaw/Makefile.am b/lib/xwidgets/xaw/Makefile.am similarity index 100% rename from lib/xaw/Makefile.am rename to lib/xwidgets/xaw/Makefile.am diff --git a/lib/xaw/ascii.d b/lib/xwidgets/xaw/ascii.d similarity index 100% rename from lib/xaw/ascii.d rename to lib/xwidgets/xaw/ascii.d diff --git a/lib/xaw/box.d b/lib/xwidgets/xaw/box.d similarity index 100% rename from lib/xaw/box.d rename to lib/xwidgets/xaw/box.d diff --git a/lib/xaw/command.d b/lib/xwidgets/xaw/command.d similarity index 100% rename from lib/xaw/command.d rename to lib/xwidgets/xaw/command.d diff --git a/lib/xaw/dialog.d b/lib/xwidgets/xaw/dialog.d similarity index 100% rename from lib/xaw/dialog.d rename to lib/xwidgets/xaw/dialog.d diff --git a/lib/xaw/form.d b/lib/xwidgets/xaw/form.d similarity index 100% rename from lib/xaw/form.d rename to lib/xwidgets/xaw/form.d diff --git a/lib/xaw/grip.d b/lib/xwidgets/xaw/grip.d similarity index 100% rename from lib/xaw/grip.d rename to lib/xwidgets/xaw/grip.d diff --git a/lib/xaw/label.d b/lib/xwidgets/xaw/label.d similarity index 100% rename from lib/xaw/label.d rename to lib/xwidgets/xaw/label.d diff --git a/lib/xaw/list.d b/lib/xwidgets/xaw/list.d similarity index 100% rename from lib/xaw/list.d rename to lib/xwidgets/xaw/list.d diff --git a/lib/xaw/menubutton.d b/lib/xwidgets/xaw/menubutton.d similarity index 100% rename from lib/xaw/menubutton.d rename to lib/xwidgets/xaw/menubutton.d diff --git a/lib/xaw/paned.d b/lib/xwidgets/xaw/paned.d similarity index 100% rename from lib/xaw/paned.d rename to lib/xwidgets/xaw/paned.d diff --git a/lib/xaw/panner.d b/lib/xwidgets/xaw/panner.d similarity index 100% rename from lib/xaw/panner.d rename to lib/xwidgets/xaw/panner.d diff --git a/lib/xaw/porthole.d b/lib/xwidgets/xaw/porthole.d similarity index 100% rename from lib/xaw/porthole.d rename to lib/xwidgets/xaw/porthole.d diff --git a/lib/xaw/repeater.d b/lib/xwidgets/xaw/repeater.d similarity index 100% rename from lib/xaw/repeater.d rename to lib/xwidgets/xaw/repeater.d diff --git a/lib/xaw/scrollbar.d b/lib/xwidgets/xaw/scrollbar.d similarity index 100% rename from lib/xaw/scrollbar.d rename to lib/xwidgets/xaw/scrollbar.d diff --git a/lib/xaw/shell.d b/lib/xwidgets/xaw/shell.d similarity index 100% rename from lib/xaw/shell.d rename to lib/xwidgets/xaw/shell.d diff --git a/lib/xaw/simplemenu.d b/lib/xwidgets/xaw/simplemenu.d similarity index 100% rename from lib/xaw/simplemenu.d rename to lib/xwidgets/xaw/simplemenu.d diff --git a/lib/xaw/sme.d b/lib/xwidgets/xaw/sme.d similarity index 100% rename from lib/xaw/sme.d rename to lib/xwidgets/xaw/sme.d diff --git a/lib/xaw/smebsb.d b/lib/xwidgets/xaw/smebsb.d similarity index 100% rename from lib/xaw/smebsb.d rename to lib/xwidgets/xaw/smebsb.d diff --git a/lib/xaw/smeline.d b/lib/xwidgets/xaw/smeline.d similarity index 100% rename from lib/xaw/smeline.d rename to lib/xwidgets/xaw/smeline.d diff --git a/lib/xaw/stripchart.d b/lib/xwidgets/xaw/stripchart.d similarity index 100% rename from lib/xaw/stripchart.d rename to lib/xwidgets/xaw/stripchart.d diff --git a/lib/xaw/toggle.d b/lib/xwidgets/xaw/toggle.d similarity index 100% rename from lib/xaw/toggle.d rename to lib/xwidgets/xaw/toggle.d diff --git a/lib/xaw/tree.d b/lib/xwidgets/xaw/tree.d similarity index 100% rename from lib/xaw/tree.d rename to lib/xwidgets/xaw/tree.d diff --git a/lib/xaw/viewport.d b/lib/xwidgets/xaw/viewport.d similarity index 100% rename from lib/xaw/viewport.d rename to lib/xwidgets/xaw/viewport.d diff --git a/lib/xt/xt.h b/lib/xwidgets/xt.h similarity index 100% rename from lib/xt/xt.h rename to lib/xwidgets/xt.h diff --git a/lib/xt/xterror.c b/lib/xwidgets/xterror.c similarity index 100% rename from lib/xt/xterror.c rename to lib/xwidgets/xterror.c diff --git a/lib/xt/xtinit.c b/lib/xwidgets/xtinit.c similarity index 100% rename from lib/xt/xtinit.c rename to lib/xwidgets/xtinit.c diff --git a/lib/xt/xtobjects.c b/lib/xwidgets/xtobjects.c similarity index 100% rename from lib/xt/xtobjects.c rename to lib/xwidgets/xtobjects.c