Merge branch 'master' of github.com:mxe/mxe

.gitignore

@@ -1,5 +1,4 @@
-usr/
-log/
-pkg
-dist/
-wip/
+/usr/
+/log/
+/pkg
+/wip/

Makefile

@@ -23,7 +23,6 @@ PREFIX     := $(PWD)/usr
 LOG_DIR    := $(PWD)/log
 TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
 PKG_DIR    := $(PWD)/pkg
-DIST_DIR   := $(PWD)/dist
 TMP_DIR     = $(PWD)/tmp-$(1)
 MAKEFILE   := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))

src/hunspell-test.cpp

@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
     dic.close();
     std::ofstream aff ("hunspell-test.aff");
     aff << "SET UTF-8\nTRY loredWH\nMAXDIFF 1";
-    aff.close();    
+    aff.close();
     Hunspell h("hunspell-test.aff", "hunspell-test.dic");
 
     if (h.spell("Hello") == 0)
@@ -28,10 +28,10 @@ int main(int argc, char *argv[])
     {
         std::cerr << "Error: hunspell marked wrong word as correct" << std::endl;
     }
-    
+
     char ** result;
     int n = h.suggest(&result, "ell");
     for (int i = 0; i < n; i++) std::cout << result[i];
-    
+
     return 0;
 }

src/hunspell.mk

@@ -31,6 +31,6 @@ define $(PKG)_BUILD
     # Test
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
         `'$(TARGET)-pkg-config' hunspell --cflags --libs`
 endef