From 277195f54e4ea783e1596323483df5a73418277f Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 28 Aug 2003 09:40:34 +0000 Subject: [PATCH] * Use XAW_LIBS etc. to build plugins. git-svn-id: svn://svn.zoy.org/elk/trunk@60 55e467fa-43c5-0310-a8a2-de718669efc6 --- lib/xaw/Makefile.am | 50 ++++++++++++++++++++++++++++-------- lib/xlib/Makefile.am | 4 +-- lib/xm/Makefile.am | 60 ++++++++++++++++++++++++++++++-------------- lib/xt/Makefile.am | 13 +++++++--- 4 files changed, 92 insertions(+), 35 deletions(-) diff --git a/lib/xaw/Makefile.am b/lib/xaw/Makefile.am index 9a02f07..5e4bf7f 100644 --- a/lib/xaw/Makefile.am +++ b/lib/xaw/Makefile.am @@ -1,10 +1,24 @@ NULL = +EXTRA_DIST = $(DATA) $(D_FILES) + pkglib_xaw_DATA = ALIASES pkglib_xaw_LTLIBRARIES = xaw.la pkglib_xawdir = $(pkglibdir)/xaw -xaw_la_SOURCES = \ +nodist_xaw_la_SOURCES = $(C_FILES) +xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@ +xaw_la_LDFLAGS = -module -avoid-version +xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@ + +.d.c: + $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xaw + +clean: clean-local +clean-local: + -rm -f $(C_FILES) + +C_FILES = \ ascii.c \ box.c \ command.c \ @@ -29,14 +43,30 @@ xaw_la_SOURCES = \ tree.c \ viewport.c \ $(NULL) -xaw_la_CFLAGS = -I/usr/X11R6/include -I$(srcdir)/../xlib -xaw_la_LDFLAGS = -module -avoid-version -xaw_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -.d.c: - $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xaw - -clean: clean-local -clean-local: - -rm -f *.c +D_FILES = \ + ascii.d \ + box.d \ + command.d \ + dialog.d \ + form.d \ + grip.d \ + label.d \ + list.d \ + menubutton.d \ + paned.d \ + panner.d \ + porthole.d \ + repeater.d \ + scrollbar.d \ + shell.d \ + simplemenu.d \ + sme.d \ + smebsb.d \ + smeline.d \ + stripchart.d \ + toggle.d \ + tree.d \ + viewport.d \ + $(NULL) diff --git a/lib/xlib/Makefile.am b/lib/xlib/Makefile.am index 70bc848..b65f067 100644 --- a/lib/xlib/Makefile.am +++ b/lib/xlib/Makefile.am @@ -7,9 +7,9 @@ EXTRA_DIST = MISSING pkglib_LTLIBRARIES = xlib.la xlib_la_SOURCES = $(SOURCES_XLIB) -xlib_la_CFLAGS = -I/usr/X11R6/include +xlib_la_CFLAGS = @X_CFLAGS@ xlib_la_LDFLAGS = -module -avoid-version -xlib_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lX11 +xlib_la_LIBADD = $(top_builddir)/src/libelk.la @X_LIBS@ extensions_HEADERS = xlib.h extensionsdir = $(pkgincludedir)/extensions diff --git a/lib/xm/Makefile.am b/lib/xm/Makefile.am index aa42940..dee22ce 100644 --- a/lib/xm/Makefile.am +++ b/lib/xm/Makefile.am @@ -1,13 +1,24 @@ NULL = -include ../xlib/Include.am -include ../xt/Include.am +EXTRA_DIST = $(DATA) $(D_FILES) pkglib_xm_DATA = ALIASES pkglib_xm_LTLIBRARIES = xm.la pkglib_xmdir = $(pkglibdir)/xm -xm_la_SOURCES = \ +nodist_xm_la_SOURCES = $(C_FILES) +xm_la_CFLAGS = -I$(srcdir)/../xlib @XM_LIBS@ +xm_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning +xm_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@ + +.d.c: + $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xm + +clean: clean-local +clean-local: + -rm -f $(C_FILES) + +C_FILES = \ arrow-button.c \ bulletin-brd.c \ cascade-btn.c \ @@ -34,21 +45,32 @@ xm_la_SOURCES = \ text.c \ toggle-btn.c \ $(NULL) -xm_la_CFLAGS = -I/usr/X11R6/include -I/usr/include/Xm -I$(srcdir)/../xlib -xm_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning -xm_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lXm -lXmu -lXt -lSM -lICE -lXext -lX11 -pkglib_LTLIBRARIES = xt-motif.la - -xt_motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB) -xt_motif_la_CFLAGS = -I/usr/include/Xm -I/usr/X11R6/include -I$(srcdir)/../xlib -xt_motif_la_LDFLAGS = -module -avoid-version -xt_motif_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lXm -lXmu -lXt -lSM -lICE -lXext -lX11 - -.d.c: - $(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xm - -clean: clean-local -clean-local: - -rm -f *.c +D_FILES = \ + arrow-button.d \ + bulletin-brd.d \ + cascade-btn.d \ + command.d \ + drawing-area.d \ + drawn-button.d \ + file-selectn.d \ + form.d \ + frame.d \ + label.d \ + list.d \ + main-window.d \ + message-box.d \ + paned-window.d \ + push-button.d \ + row-column.d \ + scale.d \ + scroll-bar.d \ + scrolled-win.d \ + selectn-box.d \ + separator.d \ + shell.d \ + support.d \ + text.d \ + toggle-btn.d \ + $(NULL) diff --git a/lib/xt/Makefile.am b/lib/xt/Makefile.am index 8c24dfa..199c7b0 100644 --- a/lib/xt/Makefile.am +++ b/lib/xt/Makefile.am @@ -3,14 +3,19 @@ NULL = include ../xlib/Include.am include ../xt/Include.am -EXTRA_DIST = MISSING +EXTRA_DIST = MISSING mkwidget.scm -pkglib_LTLIBRARIES = xt.la +pkglib_LTLIBRARIES = xt.la xt-motif.la xt_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB) -xt_la_CFLAGS = -I/usr/X11R6/include -I$(srcdir)/../xlib +xt_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@ xt_la_LDFLAGS = -module -avoid-version -xt_la_LIBADD = $(top_builddir)/src/libelk.la -L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 +xt_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@ + +xt_motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB) +xt_motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@ +xt_motif_la_LDFLAGS = -module -avoid-version +xt_motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@ extensions_HEADERS = xt.h extensionsdir = $(pkgincludedir)/extensions