diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-02-04 16:30:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-04 16:30:24 +0000 |
| commit | d5d7040f800a354fe932c0b02629e6a12b91b602 (patch) | |
| tree | 375ca4c5d9602d7d7b8e298df0b79a969288f9ed | |
| parent | c5f0aa7e8ee102428b277226fa55bc9b6a4a5c49 (diff) | |
| parent | 89a2a4295010231509d4510ca021272849e027ba (diff) | |
| download | enchant-d5d7040f800a354fe932c0b02629e6a12b91b602.tar.gz | |
Merge pull request #66 from rrthomas/master
Some minor improvements to the tests Makefile.am
| -rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 1a9ad73..aeef1fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,11 +1,11 @@ -AM_CPPFLAGS=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS) # Note: each directory is given with and without $(ENCHANT_LT_OBJDIR) to # work with static builds and on systems that do not have static compilation # and hence don't use LT_OBJDIR. # FIXME: Following line is ugly (but inserting backslashes stops it # working), and not portable to Windows (need semicolons instead of colons) -AM_TESTS_ENVIRONMENT=\ +AM_TESTS_ENVIRONMENT = \ ENCHANT_MODULE_PATH=$(top_builddir)/src/applespell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/applespell:$(top_builddir)/src/aspell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/aspell:$(top_builddir)/src/hspell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/hspell:$(top_builddir)/src/ispell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/ispell:$(top_builddir)/src/myspell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/myspell:$(top_builddir)/src/uspell/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/uspell:$(top_builddir)/src/voikko/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/voikko:$(top_builddir)/src/zemberek/$(ENCHANT_LT_OBJDIR):$(top_builddir)/src/zemberek; \ export ENCHANT_MODULE_PATH; \ rm -f test.pwl; \ @@ -14,24 +14,16 @@ AM_TESTS_ENVIRONMENT=\ DISTCLEANFILES = test.pwl -EXTRA_DIST=test.pwl.orig ispell.in +EXTRA_DIST = test.pwl.orig ispell.in -ldadd= $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS) +LDADD = $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS) check_PROGRAMS = enchant.test enchantxx.test -bin_PROGRAMS= enchant-lsmod enchant +bin_PROGRAMS = enchant-lsmod enchant enchant_test_SOURCES = enchant.test.c -enchant_test_LDADD = $(ldadd) - enchant_SOURCES = enchant-ispell.c -enchant_LDADD = $(ldadd) - enchantxx_test_SOURCES = enchantxx.test.cpp -enchantxx_test_LDADD = $(ldadd) - -enchant_lsmod_SOURCES = enchant-lsmod.c -enchant_lsmod_LDADD = $(ldadd) TESTS = $(check_PROGRAMS) |