diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-09-28 11:23:09 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-09-28 11:32:04 +0300 |
commit | ac1d6cbbcf5323d5db59886b98a24c45bafa64b8 (patch) | |
tree | f2a77092e072faa680b47d9d6d960e7214e46876 /etc/Makefile.am | |
parent | d902742081bc31a6eda274268da0178107e4abb4 (diff) | |
download | eclat-ac1d6cbbcf5323d5db59886b98a24c45bafa64b8.tar.gz eclat-ac1d6cbbcf5323d5db59886b98a24c45bafa64b8.tar.bz2 |
Improve testsuite. Reorganize directory structure.
* Makefile.am (SUBDIRS): Add etc
(distuninstallcheck_listfiles): Ignore *.forlan files.
* configure.ac: New options --split-format and --format-dir
* etc/Makefile.am: New file.
* etc/default.fln: New file.
* etc/describe-instance-status.fln: New file.
* etc/describe-instances.fln: New file.
* etc/describe-tags.fln: New file.
* etc/eclat.cfin: New file.
* etc/flncat.c: New file.
* etc/start-instances.fln: New file.
* etc/stop-instances.fln: New file.
* src/Makefile.am: Remove eclat.conf. It is built in /etc now.
* src/eclat.conf: Remove.
* src/cmdline.opt: Update.
* src/config.c: New configuration statement "format-file".
* src/eclat.c (format_file_option): New global.
(main): Read format from format-file, if supplied. Expand
keywords in its argument.
* src/eclat.h (format_file_option): New extern.
* tests/.gitignore: Update.
* tests/Makefile.am: Add new files.
* tests/describe-instance-status.at: New test case.
* tests/describe-instances.at: New test case.
* tests/describe-tags.at: New test case.
* tests/dscrinststat.at: New test case.
* tests/start-instances.at: New test case.
* tests/stop-instances.at: New test case.
* tests/testsuite.at (ECLAT_TEST_FORMAT): New macro.
Include new test cases.
* tests/trws.c: New file.
Diffstat (limited to 'etc/Makefile.am')
-rw-r--r-- | etc/Makefile.am | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am new file mode 100644 index 0000000..5eec565 --- /dev/null +++ b/etc/Makefile.am @@ -0,0 +1,60 @@ +# This file is part of Eclat +# Copyright (C) 2012 Sergey Poznyakoff +# +# Eclat is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# Eclat is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Eclat. If not, see <http://www.gnu.org/licenses/>. + +noinst_PROGRAMS = flncat + +FLNFILES=\ + describe-instance-status.fln\ + describe-instances.fln\ + describe-tags.fln\ + start-instances.fln\ + stop-instances.fln + +EXTRA_DIST=$(FLNFILES) default.fln eclat.cfin + +noinst_SCRIPTS=eclat.conf +CLEANFILES=eclat.conf +SUFFIXES=.cfin .conf + +if SPLIT_FORMATS +SUFFIXES += .forlan .fln +.fln.forlan: + $(AM_V_GEN)$(abs_builddir)/flncat $< default.fln > $@ +formatdir = @FORMATDIR@ +noinst_SCRIPTS += $(FLNFILES:.fln=.forlan) +CLEANFILES += $(FLNFILES:.fln=.forlan) +FORMATNAME = $${command} +else +formatdir = @FORMATDIR@ +noinst_SCRIPTS += eclat.forlan +CLEANFILES += eclat.forlan +eclat.forlan: $(FLNFILES) default.fln + $(AM_V_GEN)(cd $(srcdir); $(abs_builddir)/flncat $(FLNFILES) default.fln) > eclat.forlan +FORMATNAME = eclat +endif + +.cfin.conf: + $(AM_V_GEN)sed 's^FORMATDIR^$(formatdir)^;s^FORMATNAME^$(FORMATNAME)^' $< > $@ + +install-data-local: + @test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" + @if [ -r $(DESTDIR)$(sysconfdir)/eclat.conf ]; then :; \ + else ${INSTALL} -m 644 $(top_srcdir)/src/eclat.conf \ + $(DESTDIR)$(sysconfdir)/eclat.conf; \ + for file in $(noinst_SCRIPTS); do \ + ${INSTALL} -m 644 $$file $(DESTDIR)$(formatdir)/$$file; \ + done; \ + fi |