Merge pull request #90 from rrthomas/master

Move installed programs from tests/ to src/

6 files changed, 12 insertions, 10 deletions

diff --git a/src/.gitignore b/src/.gitignore
index f66b20d..67440b6 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1 +1,5 @@
+/enchant
+/enchant.exe
+/enchant-lsmod
+/enchant-lsmod.exe
 /libenchant.rc
diff --git a/src/Makefile.am b/src/Makefile.am
index deedb5b..fb8f0c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,10 @@
 SUBDIRS=. aspell ispell uspell myspell hspell applespell voikko zemberek
 
-AM_CPPFLAGS=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\"
+AM_CPPFLAGS=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS)
 
 lib_LTLIBRARIES = libenchant.la
 
+libenchant_la_CPPFLAGS = $(AM_CPPFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\"
 libenchant_la_LIBADD= $(ENCHANT_LIBS) @ENCHANT_WIN32_RESOURCE@
 
 libenchant_la_LDFLAGS = -no-undefined -export-symbols-regex '^enchant_.*'
@@ -20,11 +21,15 @@ libenchant_includedir = $(includedir)/enchant
 libenchant_include_HEADERS = enchant.h enchant-provider.h enchant++.h
 
 if WITH_APPLESPELL
-AM_CPPFLAGS += @APPLESPELL_CFLAGS@
+libenchant_la_CPPFLAGS += @APPLESPELL_CFLAGS@
 libenchant_la_LIBADD += @APPLESPELL_LIBS@
 libenchant_la_LDFLAGS += @APPLESPELL_LDFLAGS@
 endif
 
+LDADD = libenchant.la $(ENCHANT_LIBS)
+bin_PROGRAMS = enchant-lsmod enchant
+enchant_SOURCES = enchant-ispell.c
+
 EXTRA_DIST=enchant.i
 
 if OS_WIN32
@@ -32,4 +37,3 @@ if OS_WIN32
 @ENCHANT_WIN32_RESOURCE@ : libenchant.rc
 	$(top_srcdir)/lt-compile-resource libenchant.rc @ENCHANT_WIN32_RESOURCE@
 endif
-
diff --git a/tests/enchant-ispell.c b/src/enchant-ispell.c
index e3ff922..5d9aa4b 100644
--- a/tests/enchant-ispell.c
+++ b/src/enchant-ispell.c
@@ -477,7 +477,7 @@ parse_file (FILE * in, FILE * out, IspellMode_t mode, int countLines, gchar *dic
 
 				case '$': /* Save correction for rest of session [aspell extension] */
 					{ /* Syntax: $$ra <MISSPELLED>,<REPLACEMENT> */
-						gchar *prefix = "$$ra ";
+						const gchar *prefix = "$$ra ";
 						if (g_str_has_prefix(str->str, prefix)) {
 							gchar *comma = g_utf8_strchr(str->str, -1, (gunichar)',');
 							char *mis = str->str + strlen(prefix);
diff --git a/tests/enchant-lsmod.c b/src/enchant-lsmod.c
index 6ed3f4f..6ed3f4f 100644
--- a/tests/enchant-lsmod.c
+++ b/src/enchant-lsmod.c
diff --git a/tests/.gitignore b/tests/.gitignore
index b6b3a4d..25d92cc 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,3 @@
-/enchant
-/enchant.exe
-/enchant-lsmod
-/enchant-lsmod.exe
 /ispell
 /enchant.test
 /enchant.test.exe
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aeef1fd..139f963 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,10 +19,8 @@ EXTRA_DIST = test.pwl.orig ispell.in
 LDADD = $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS)
 
 check_PROGRAMS = enchant.test enchantxx.test
-bin_PROGRAMS = enchant-lsmod enchant
 
 enchant_test_SOURCES = enchant.test.c
-enchant_SOURCES = enchant-ispell.c
 enchantxx_test_SOURCES = enchantxx.test.cpp
 
 TESTS = $(check_PROGRAMS)