From 692e24750b7dd3fc297087680b73b4000912139f Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 24 Aug 2000 15:59:42 +0000 Subject: [PATCH] * lib/Makefile.am: simplified, fixed "make dist" --- ChangeLog | 2 ++ lib/Makefile.am | 29 ++++++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a4d49ce9..e7de52af0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2000-08-24 Pavel Roskin + * lib/Makefile.am: simplified, fixed "make dist" + * lib/Makefile.in: converted to ... * lib/Makefile.am: ... this diff --git a/lib/Makefile.am b/lib/Makefile.am index 0dd1041b9..37e53560f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,16 +4,11 @@ suppbindir = $(mclibdir)/bin tidir = $(mclibdir)/term confdir = $(sysconfdir) -LIBFILES_IN = mc.ext.in mc-gnome.ext.in LIBFILES_OUT = mc.ext mc-gnome.ext LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru \ mc.lib mc.menu cedit.menu edit.indent.rc -SUPPBIN_IN = mc.csh.in mc.sh.in -SUPPBIN_OUT = mc.csh mc.sh -DESKTOP_FILES = startup.links README.desktop -TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap -NOINST_FILES = tdiff \ - tdiff \ + +noinst_DATA = \ xnc.hlp \ ncurses.h \ mcserv.init \ @@ -21,12 +16,20 @@ NOINST_FILES = tdiff \ mc.ext.in.qnx.diff \ mc.global -conf_DATA = mc.global +noinst_SCRIPTS = tdiff -# Files processed by configure don't need to be here -EXTRA_DIST = $(LIBFILES_CONST) $(TIFILES) $(DESKTOP_FILES) $(conf_DATA) +conf_DATA = mc.global +suppbin_SCRIPTS = mc.csh mc.sh +desktop_DATA = startup.links README.desktop +ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap mclib_DATA = $(LIBFILES_CONST) $(LIBFILES_OUT) -suppbin_SCRIPTS = $(SUPPBIN_OUT) -ti_DATA = $(TIFILES) -desktop_DATA = $(DESKTOP_FILES) + +# Files processed by configure don't need to be here +EXTRA_DIST = \ + $(LIBFILES_CONST) \ + $(conf_DATA) \ + $(desktop_DATA) \ + $(ti_DATA) \ + $(noinst_DATA) \ + $(noinst_SCRIPTS)