1.1 --- a/pre-inst/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
     1.2 +++ b/pre-inst/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
     1.3 @@ -9,11 +9,13 @@
     1.4  AM_LDFLAGS=-mwindows
     1.5  endif
     1.6  INCLUDES=-I$(top_srcdir) -I$(srcdir)
     1.7 +CCLD = $(CXX)
     1.8  
     1.9  bin_PROGRAMS=pre-inst
    1.10  
    1.11  pre_inst_SOURCES=pre-inst.c
    1.12  pre_inst_LDFLAGS=$(AM_LDFLAGS) -all-static
    1.13 +pre_inst_LIBTOOLFLAGS=--tag=CXX
    1.14  if HAVE_WINDRES
    1.15  pre_inst_SOURCES+=resources.rc pre-inst.exe.manifest resource.h
    1.16  endif

     2.1 --- a/setup/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
     2.2 +++ b/setup/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
     2.3 @@ -1,12 +1,14 @@
     2.4  AM_CFLAGS=-g $(SETUP_CFLAGS)
     2.5  LDADD=../plover/libplover.la $(SETUP_LIBS)
     2.6  INCLUDES=-I$(top_srcdir)
     2.7 +CCLD = $(CXX)
     2.8  
     2.9  bin_PROGRAMS=setup
    2.10  bin_SCRIPTS=setup.js
    2.11  
    2.12  setup_SOURCES=setup.c
    2.13  setup_LDFLAGS=-all-static
    2.14 +setup_LIBTOOLFLAGS=--tag=CXX
    2.15  if HAVE_WINDRES
    2.16  setup_SOURCES+=resources.rc setup.exe.manifest
    2.17  endif

     3.1 --- a/update/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
     3.2 +++ b/update/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
     3.3 @@ -1,12 +1,14 @@
     3.4  AM_CFLAGS=-g $(SETUP_CFLAGS)
     3.5  LDADD=../plover/libplover.la $(SETUP_LIBS)
     3.6  INCLUDES=-I$(top_srcdir)
     3.7 +CCLD = $(CXX)
     3.8  
     3.9  bin_PROGRAMS=update
    3.10  bin_SCRIPTS=update.js
    3.11  
    3.12  update_SOURCES=update.c
    3.13  update_LDFLAGS=-all-static
    3.14 +update_LIBTOOLFLAGS=--tag=CXX
    3.15  if HAVE_WINDRES
    3.16  update_SOURCES+=resources.rc update.exe.manifest
    3.17  endif