Ticket #15991: patch-hunspell-renameexes.diff

src/tools/Makefile.am

@@ -1 @@
-bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip
 
 INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
 
@@ -6 +6 @@
 hunzip_SOURCES=hunzip.cxx
 hunzip_LDADD = ../hunspell/libhunspell-1.2.la
 
-munch_SOURCES=munch.c
-unmunch_SOURCES=unmunch.c
+hunspell_munch_SOURCES=munch.c
+hunspell_unmunch_SOURCES=unmunch.c
 include_HEADERS=munch.h unmunch.h
 
-example_SOURCES=example.cxx
-example_LDADD = ../hunspell/libhunspell-1.2.la
+hunspell_example_SOURCES=example.cxx
+hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
 
 hunspell_SOURCES=hunspell.cxx
 hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
         ../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
 
-analyze_SOURCES=analyze.cxx
-analyze_LDADD = ../hunspell/libhunspell-1.2.la
-
-chmorph_SOURCES=chmorph.cxx
-chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
-
-noinst_PROGRAMS=example
+hunspell_analyze_SOURCES=analyze.cxx
+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
+
+hunspell_chmorph_SOURCES=chmorph.cxx
+hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+
+noinst_PROGRAMS=hunspell-example
 
 EXTRA_DIST=makealias affixcompress

src/tools/example.cxx

@@ -17 +17 @@
     /* first parse the command line options */
 
     if (argc < 4) {
-        fprintf(stderr,"example (now it works with more dictionary files):\n"); 
-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
+        fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); 
+        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
         exit(1);
     }
   

src/tools/munch.c

@@ -42 +42 @@
        wf = mystrdup(argv[1]);
   } else {
     fprintf(stderr,"correct syntax is:\n"); 
-    fprintf(stderr,"munch word_list_file affix_file\n");
+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
     exit(1);
   }
   if (argv[2]) {
        af = mystrdup(argv[2]);
   } else {
     fprintf(stderr,"correct syntax is:\n"); 
-    fprintf(stderr,"munch word_list_file affix_file\n");
+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
     exit(1);
   }
 

src/tools/unmunch.c

@@ -39 +39 @@
        wf = mystrdup(argv[1]);
   } else {
     fprintf(stderr,"correct syntax is:\n"); 
-    fprintf(stderr,"unmunch dic_file affix_file\n");
+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
     exit(1);
   }
   if (argv[2]) {
        af = mystrdup(argv[2]);
   } else {
     fprintf(stderr,"correct syntax is:\n"); 
-    fprintf(stderr,"unmunch dic_file affix_file\n");
+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
     exit(1);
   }
 

tests/test.sh

@@ -34 +34 @@
 shopt -s expand_aliases
 
 alias hunspell='../src/tools/hunspell'
-alias analyze='../src/tools/analyze'
+alias analyze='../src/tools/hunspell-analyze'
 
 if [ "$VALGRIND" != "" ]; then
   rm -f $TEMPDIR/test.pid*