From 40c995331a0e6ade5f4956154609f1f6ec5a5d94 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 23 Jul 2011 18:06:45 +0300
Subject: [PATCH] * don't say we're c++ when we're really c. (use dummy.cc to
 enforce c++ linking)

---
 toys/mug/Makefile.am             | 16 ++++++++++++++--
 toys/mug/{mug.cc => mug.c}       |  0
 toys/mug2/Makefile.am            | 18 +++++++++++++++---
 toys/mug2/{mug.cc => mug.c}      |  0
 toys/muile/Makefile.am           | 15 ++++++++++++++-
 toys/muile/{muile.cc => muile.c} |  0
 6 files changed, 43 insertions(+), 6 deletions(-)
 rename toys/mug/{mug.cc => mug.c} (100%)
 rename toys/mug2/{mug.cc => mug.c} (100%)
 rename toys/muile/{muile.cc => muile.c} (100%)

diff --git a/toys/mug/Makefile.am b/toys/mug/Makefile.am
index 235473be..603c875d 100644
--- a/toys/mug/Makefile.am
+++ b/toys/mug/Makefile.am
@@ -35,7 +35,7 @@ noinst_PROGRAMS=			\
 # note, mug.cc is '.cc' only because libmu must explicitly
 # be linked as c++, not c.
 mug_SOURCES=				\
-	mug.cc				\
+	mug.c				\
 	mug-msg-list-view.c		\
 	mug-msg-list-view.h		\
 	mug-msg-view.h			\
@@ -43,7 +43,19 @@ mug_SOURCES=				\
 	mug-query-bar.h			\
 	mug-query-bar.c			\
 	mug-shortcuts.c			\
-	mug-shortcuts.h
+	mug-shortcuts.h			\
+	dummy.cc
+
+# we need to use dummy.cc to enforce c++ linking...
+BUILT_SOURCES=						\
+	dummy.cc
+
+dummy.cc:
+	touch dummy.cc
+
+DISTCLEANFILES=						\
+	$(BUILT_SOURCES)
+
 
 mug_LDADD=				\
 	${top_builddir}/src/libmu.la	\
diff --git a/toys/mug/mug.cc b/toys/mug/mug.c
similarity index 100%
rename from toys/mug/mug.cc
rename to toys/mug/mug.c
diff --git a/toys/mug2/Makefile.am b/toys/mug2/Makefile.am
index 6f2168c1..7b3062ff 100644
--- a/toys/mug2/Makefile.am
+++ b/toys/mug2/Makefile.am
@@ -28,13 +28,13 @@ INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DIC
 AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
 AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
 
-noinst_PROGRAMS=					\
+noinst_PROGRAMS=				\
 	mug2
 
 # note, mug.cc is '.cc' only because libmu must explicitly
 # be linked as c++, not c.
 mug2_SOURCES=					\
-	mug.cc					\
+	mug.c					\
 	mug-msg-list-view.c			\
 	mug-msg-list-view.h			\
 	mug-msg-view.h				\
@@ -42,7 +42,19 @@ mug2_SOURCES=					\
 	mug-query-bar.h				\
 	mug-query-bar.c				\
 	mug-shortcuts.c				\
-	mug-shortcuts.h
+	mug-shortcuts.h				\
+	dummy.cc
+
+# we need to use dummy.cc to enforce c++ linking...
+BUILT_SOURCES=					\
+	dummy.cc
+
+dummy.cc:
+	touch dummy.cc
+
+DISTCLEANFILES=					\
+	$(BUILT_SOURCES)
+
 
 mug2_LDADD=					\
 	${top_builddir}/src/libmu.la		\
diff --git a/toys/mug2/mug.cc b/toys/mug2/mug.c
similarity index 100%
rename from toys/mug2/mug.cc
rename to toys/mug2/mug.c
diff --git a/toys/muile/Makefile.am b/toys/muile/Makefile.am
index 938b81b1..64f0fc4a 100644
--- a/toys/muile/Makefile.am
+++ b/toys/muile/Makefile.am
@@ -29,7 +29,20 @@ noinst_PROGRAMS=				\
 	muile
 
 muile_SOURCES=					\
-	muile.cc
+	muile.c					\
+	dummy.cc
+
+# we need to use dummy.cc to enforce c++ linking...
+BUILT_SOURCES=						\
+	dummy.cc
+
+dummy.cc:
+	touch dummy.cc
+
+DISTCLEANFILES=						\
+	$(BUILT_SOURCES)
+
+
 
 muile_LDFLAGS=					\
 	${top_builddir}/libmuguile/libmuguile.la
diff --git a/toys/muile/muile.cc b/toys/muile/muile.c
similarity index 100%
rename from toys/muile/muile.cc
rename to toys/muile/muile.c