From 306455fc2565aa2309e43bf4c81231da16c03bc0 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 4 Sep 2003 11:26:39 +0000 Subject: [PATCH] * Cosmetic fixes. git-svn-id: svn://svn.zoy.org/elk/trunk@83 55e467fa-43c5-0310-a8a2-de718669efc6 --- lib/xwidgets/Makefile.am | 2 +- lib/xwidgets/mkwidget.scm | 2 +- lib/xwidgets/motif/Makefile.am | 10 +++++----- lib/xwidgets/xaw/Makefile.am | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/xwidgets/Makefile.am b/lib/xwidgets/Makefile.am index d0f9c51..12c5765 100644 --- a/lib/xwidgets/Makefile.am +++ b/lib/xwidgets/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = xaw motif +SUBDIRS = xaw motif . NULL = diff --git a/lib/xwidgets/mkwidget.scm b/lib/xwidgets/mkwidget.scm index 34bac4f..6f97802 100644 --- a/lib/xwidgets/mkwidget.scm +++ b/lib/xwidgets/mkwidget.scm @@ -192,6 +192,6 @@ (if (caddr cb) 1 0))) (for-each (lambda (x) (display x f)) primitives) (for-each (lambda (x) (display x f)) converters) -(format f " P_Provide(Intern(\"~a:~a.o\"));~%" widget-set +(format f " P_Provide(Intern(\"~a:~a\"));~%" widget-set (feature-name (car args))) (format f "}~%") diff --git a/lib/xwidgets/motif/Makefile.am b/lib/xwidgets/motif/Makefile.am index 07655bf..f09f9c4 100644 --- a/lib/xwidgets/motif/Makefile.am +++ b/lib/xwidgets/motif/Makefile.am @@ -1,10 +1,10 @@ NULL = -EXTRA_DIST = $(D_FILES) +EXTRA_DIST = $(SOURCES_D) pkglib_LTLIBRARIES = motif-widgets.la -nodist_motif_widgets_la_SOURCES = $(C_FILES) +nodist_motif_widgets_la_SOURCES = $(SOURCES_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@ @@ -14,9 +14,9 @@ motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@ clean: clean-local clean-local: - -rm -f $(C_FILES) + -rm -f $(SOURCES_C) -C_FILES = \ +SOURCES_C = \ arrow-button.c \ bulletin-brd.c \ cascade-btn.c \ @@ -44,7 +44,7 @@ C_FILES = \ toggle-btn.c \ $(NULL) -D_FILES = \ +SOURCES_D = \ arrow-button.d \ bulletin-brd.d \ cascade-btn.d \ diff --git a/lib/xwidgets/xaw/Makefile.am b/lib/xwidgets/xaw/Makefile.am index 37cc414..6bcd709 100644 --- a/lib/xwidgets/xaw/Makefile.am +++ b/lib/xwidgets/xaw/Makefile.am @@ -1,10 +1,10 @@ NULL = -EXTRA_DIST = $(D_FILES) +EXTRA_DIST = $(SOURCES_D) pkglib_LTLIBRARIES = xaw-widgets.la -nodist_xaw_widgets_la_SOURCES = $(C_FILES) +nodist_xaw_widgets_la_SOURCES = $(SOURCES_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@ @@ -14,9 +14,9 @@ xaw_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@ clean: clean-local clean-local: - -rm -f $(C_FILES) + -rm -f $(SOURCES_C) -C_FILES = \ +SOURCES_C = \ ascii.c \ box.c \ command.c \ @@ -42,7 +42,7 @@ C_FILES = \ viewport.c \ $(NULL) -D_FILES = \ +SOURCES_D = \ ascii.d \ box.d \ command.d \