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

* Rebuild everything properly. 

git-svn-id: svn://svn.zoy.org/elk/trunk@77 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-03 22:56:02 +00:00
parent 28da7c3327
commit a8dc438a27
5 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/xwidgets/Include.am
View File

@ -1,18 +0,0 @@
SOURCES_XT = \
../xt/accelerator.c \
../xt/action.c \
../xt/callback.c \
../xt/class.c \
../xt/classname.c \
../xt/context.c \
../xt/converter.c \
../xt/function.c \
../xt/identifier.c \
../xt/popup.c \
../xt/resource.c \
../xt/translation.c \
../xt/widget.c \
../xt/xterror.c \
../xt/xtinit.c \
../xt/xtobjects.c \
$(NULL)

38
lib/xwidgets/Makefile.am
View File

@ -3,22 +3,40 @@ SUBDIRS = xaw motif
NULL = NULL =
include ../xlib/Include.am include ../xlib/Include.am
include ../xt/Include.am
EXTRA_DIST = MISSING mkwidget.scm EXTRA_DIST = MISSING mkwidget.scm
pkglib_LTLIBRARIES = xt.la xt-motif.la pkglib_LTLIBRARIES = xaw.la motif.la
xt_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB) xaw_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
xt_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@ xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
xt_la_LDFLAGS = -module -avoid-version xaw_la_LDFLAGS = -module -avoid-version
xt_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@ xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
xt_motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB) motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
xt_motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@ motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
xt_motif_la_LDFLAGS = -module -avoid-version motif_la_LDFLAGS = -module -avoid-version
xt_motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@ motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
extensions_HEADERS = xt.h extensions_HEADERS = xt.h
extensionsdir = $(pkgincludedir)/extensions extensionsdir = $(pkgincludedir)/extensions
SOURCES_XT = \
accelerator.c \
action.c \
callback.c \
class.c \
classname.c \
context.c \
converter.c \
function.c \
identifier.c \
popup.c \
resource.c \
translation.c \
widget.c \
xterror.c \
xtinit.c \
xtobjects.c \
$(NULL)

6
lib/xwidgets/mkwidget.scm
View File

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

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

@ -1,18 +1,16 @@
NULL = NULL =
EXTRA_DIST = $(DATA) $(D_FILES) EXTRA_DIST = $(D_FILES)
pkglib_xm_DATA = ALIASES pkglib_LTLIBRARIES = motif-widgets.la
pkglib_xm_LTLIBRARIES = xm.la
pkglib_xmdir = $(pkglibdir)/xm
nodist_xm_la_SOURCES = $(C_FILES) nodist_motif_widgets_la_SOURCES = $(C_FILES)
xm_la_CFLAGS = -I$(srcdir)/../xlib @XM_LIBS@ motif_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
xm_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning motif_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
xm_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@ motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
.d.c: .d.c:
$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xm $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ motif
clean: clean-local clean: clean-local
clean-local: clean-local:

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

@ -1,18 +1,16 @@
NULL = NULL =
EXTRA_DIST = $(DATA) $(D_FILES) EXTRA_DIST = $(D_FILES)
pkglib_xaw_DATA = ALIASES pkglib_LTLIBRARIES = xaw-widgets.la
pkglib_xaw_LTLIBRARIES = xaw.la
pkglib_xawdir = $(pkglibdir)/xaw
nodist_xaw_la_SOURCES = $(C_FILES) nodist_xaw_widgets_la_SOURCES = $(C_FILES)
xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@ xaw_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XAW_CFLAGS@
xaw_la_LDFLAGS = -module -avoid-version xaw_widgets_la_LDFLAGS = -module -avoid-version
xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@ xaw_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
.d.c: .d.c:
$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xaw $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ xaw
clean: clean-local clean: clean-local
clean-local: clean-local: