conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Renamed xaw-common.so to xaw-xt.so and motif-common.so to motif-xt.so. 

* Added init.c to xaw-xt.so and motif-xt.so for proper initialisation.


git-svn-id: svn://svn.zoy.org/elk/trunk@85 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-04 12:44:54 +00:00
parent 70f8be7a33
commit 13144820f9
5 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/xwidgets/Makefile.am
View File

@ -2,21 +2,21 @@ SUBDIRS = xaw motif .
NULL =
include ../xlib/Include.am
#include ../xlib/Include.am
EXTRA_DIST = MISSING mkwidget.scm
pkglib_LTLIBRARIES = xaw.la motif.la
pkglib_LTLIBRARIES = xaw-xt.la motif-xt.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@
xaw_xt_la_SOURCES = $(SOURCES_XT)
xaw_xt_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
xaw_xt_la_LDFLAGS = -module -avoid-version
xaw_xt_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
motif_la_LDFLAGS = -module -avoid-version
motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
motif_xt_la_SOURCES = $(SOURCES_XT)
motif_xt_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
motif_xt_la_LDFLAGS = -module -avoid-version
motif_xt_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
extensions_HEADERS = xt.h
extensionsdir = $(pkgincludedir)/extensions

1
lib/xwidgets/motif/Makefile.am
View File

@ -5,6 +5,7 @@ EXTRA_DIST = $(SOURCES_D)
pkglib_LTLIBRARIES = motif-widgets.la
nodist_motif_widgets_la_SOURCES = $(SOURCES_C)
motif_widgets_la_SOURCES = init.c
motif_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
motif_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@

35
lib/xwidgets/motif/init.c Normal file
View File

@ -0,0 +1,35 @@
/* init.c
*
* $Id$
*
* Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
* Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
*
* This software was derived from Elk 1.2, which was Copyright 1987, 1988,
* 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
* by Oliver Laumann for TELES Telematic Services, Berlin, in a joint project
* between TELES and Nixdorf Microprocessor Engineering, Berlin).
*
* Oliver Laumann, TELES GmbH, Nixdorf Computer AG and Sam Hocevar, as co-
* owners or individual owners of copyright in this software, grant to any
* person or company a worldwide, royalty free, license to
*
* i) copy this software,
* ii) prepare derivative works based on this software,
* iii) distribute copies of this software or derivative works,
* iv) perform this software, or
* v) display this software,
*
* provided that this notice is not removed and that neither Oliver Laumann
* nor Teles nor Nixdorf are deemed to have made any representations as to
* the suitability of this software for any purpose nor are held responsible
* for any defects of this software.
*
* THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
#include "scheme.h"
elk_init_motif_init () {
P_Provide (Intern ("motif-widgets.so"));
}

1
lib/xwidgets/xaw/Makefile.am
View File

@ -5,6 +5,7 @@ EXTRA_DIST = $(SOURCES_D)
pkglib_LTLIBRARIES = xaw-widgets.la
nodist_xaw_widgets_la_SOURCES = $(SOURCES_C)
xaw_widgets_la_SOURCES = init.c
xaw_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XAW_CFLAGS@
xaw_widgets_la_LDFLAGS = -module -avoid-version
xaw_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@

35
lib/xwidgets/xaw/init.c Normal file
View File

@ -0,0 +1,35 @@
/* init.c
*
* $Id$
*
* Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
* Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
*
* This software was derived from Elk 1.2, which was Copyright 1987, 1988,
* 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
* by Oliver Laumann for TELES Telematic Services, Berlin, in a joint project
* between TELES and Nixdorf Microprocessor Engineering, Berlin).
*
* Oliver Laumann, TELES GmbH, Nixdorf Computer AG and Sam Hocevar, as co-
* owners or individual owners of copyright in this software, grant to any
* person or company a worldwide, royalty free, license to
*
* i) copy this software,
* ii) prepare derivative works based on this software,
* iii) distribute copies of this software or derivative works,
* iv) perform this software, or
* v) display this software,
*
* provided that this notice is not removed and that neither Oliver Laumann
* nor Teles nor Nixdorf are deemed to have made any representations as to
* the suitability of this software for any purpose nor are held responsible
* for any defects of this software.
*
* THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
#include "scheme.h"
elk_init_xaw_init () {
P_Provide (Intern ("xaw-widgets.so"));
}