* don't say we're c++ when we're really c. (use dummy.cc to enforce c++ linking)

This commit is contained in:
Dirk-Jan C. Binnema
2011-07-23 18:06:45 +03:00
parent c8314e08d1
commit 40c995331a
6 changed files with 43 additions and 6 deletions

View File

@ -35,7 +35,7 @@ noinst_PROGRAMS= \
# note, mug.cc is '.cc' only because libmu must explicitly # note, mug.cc is '.cc' only because libmu must explicitly
# be linked as c++, not c. # be linked as c++, not c.
mug_SOURCES= \ mug_SOURCES= \
mug.cc \ mug.c \
mug-msg-list-view.c \ mug-msg-list-view.c \
mug-msg-list-view.h \ mug-msg-list-view.h \
mug-msg-view.h \ mug-msg-view.h \
@ -43,7 +43,19 @@ mug_SOURCES= \
mug-query-bar.h \ mug-query-bar.h \
mug-query-bar.c \ mug-query-bar.c \
mug-shortcuts.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= \ mug_LDADD= \
${top_builddir}/src/libmu.la \ ${top_builddir}/src/libmu.la \

View File

@ -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_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
noinst_PROGRAMS= \ noinst_PROGRAMS= \
mug2 mug2
# note, mug.cc is '.cc' only because libmu must explicitly # note, mug.cc is '.cc' only because libmu must explicitly
# be linked as c++, not c. # be linked as c++, not c.
mug2_SOURCES= \ mug2_SOURCES= \
mug.cc \ mug.c \
mug-msg-list-view.c \ mug-msg-list-view.c \
mug-msg-list-view.h \ mug-msg-list-view.h \
mug-msg-view.h \ mug-msg-view.h \
@ -42,7 +42,19 @@ mug2_SOURCES= \
mug-query-bar.h \ mug-query-bar.h \
mug-query-bar.c \ mug-query-bar.c \
mug-shortcuts.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= \ mug2_LDADD= \
${top_builddir}/src/libmu.la \ ${top_builddir}/src/libmu.la \

View File

@ -29,7 +29,20 @@ noinst_PROGRAMS= \
muile muile
muile_SOURCES= \ 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= \ muile_LDFLAGS= \
${top_builddir}/libmuguile/libmuguile.la ${top_builddir}/libmuguile/libmuguile.la