# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1460721948 -3600
# Node ID 066e557ac4532cafa50a77a032edcf40880b95c1
# Parent  a53fcb7804680c18c57a9d17d2220b7658fa0390
Use C++ linker for static executables

diff -r a53fcb780468 -r 066e557ac453 pre-inst/Makefile.am
--- a/pre-inst/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
+++ b/pre-inst/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
@@ -9,11 +9,13 @@
 AM_LDFLAGS=-mwindows
 endif
 INCLUDES=-I$(top_srcdir) -I$(srcdir)
+CCLD = $(CXX)
 
 bin_PROGRAMS=pre-inst
 
 pre_inst_SOURCES=pre-inst.c
 pre_inst_LDFLAGS=$(AM_LDFLAGS) -all-static
+pre_inst_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 pre_inst_SOURCES+=resources.rc pre-inst.exe.manifest resource.h
 endif
diff -r a53fcb780468 -r 066e557ac453 setup/Makefile.am
--- a/setup/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
+++ b/setup/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
@@ -1,12 +1,14 @@
 AM_CFLAGS=-g $(SETUP_CFLAGS)
 LDADD=../plover/libplover.la $(SETUP_LIBS)
 INCLUDES=-I$(top_srcdir)
+CCLD = $(CXX)
 
 bin_PROGRAMS=setup
 bin_SCRIPTS=setup.js
 
 setup_SOURCES=setup.c
 setup_LDFLAGS=-all-static
+setup_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 setup_SOURCES+=resources.rc setup.exe.manifest
 endif
diff -r a53fcb780468 -r 066e557ac453 update/Makefile.am
--- a/update/Makefile.am	Mon Nov 02 19:04:58 2015 +0000
+++ b/update/Makefile.am	Fri Apr 15 13:05:48 2016 +0100
@@ -1,12 +1,14 @@
 AM_CFLAGS=-g $(SETUP_CFLAGS)
 LDADD=../plover/libplover.la $(SETUP_LIBS)
 INCLUDES=-I$(top_srcdir)
+CCLD = $(CXX)
 
 bin_PROGRAMS=update
 bin_SCRIPTS=update.js
 
 update_SOURCES=update.c
 update_LDFLAGS=-all-static
+update_LIBTOOLFLAGS=--tag=CXX
 if HAVE_WINDRES
 update_SOURCES+=resources.rc update.exe.manifest
 endif