From a99cf03c1887526994b1306316b245e3ba97fc3f Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@linas.org>
Date: Sun, 11 Apr 1999 05:11:41 +0000
Subject: [PATCH] patches from Dirk Scheonberger

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1690 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 Makefile.common  | 13 ++++++++++---
 Makefile.init.in |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 330f2df283..561d0e9873 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -23,6 +23,7 @@ MOTIF_OBJS += $(addprefix obj/motif/,${MOTIF_SRCS:.c=.o})
 QT_OBJS    := $(addprefix obj/qt/,${COMMON_SRCS:.c=.o})
 QT_OBJS    += $(addprefix obj/qt/,${QT_SRCS:.cpp=.o})
 
+
 ifdef GNOME_CONFIG_BIN
   GNOME_CFLAGS += $(shell ${GNOME_CONFIG_BIN} --cflags gnomeui)
 endif
@@ -52,6 +53,12 @@ obj/%.o: %.c
 	$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) -o $@ $< 
 	${cleanupdeps}
 
+obj/%.o: %.cpp
+	@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
+	g++ -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) -o $@ $< 
+	${cleanupdeps}
+
+
 obj/motif/%.o: %.c
 	@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
 	$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${MOTIF_CFLAGS} -DMOTIF -o $@ $< 
@@ -62,12 +69,12 @@ obj/gnome/%.o: %.c
 	$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${GNOME_CFLAGS} -DGNOME -o $@ $< 
 	${cleanupdeps}
 
-obj/qt/%.o: %.c
+obj/qt/%.o: %.cpp
 	@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
-	$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${QT_CFLAGS} -DKDE -o $@ $< 
+	g++ -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${QT_CFLAGS} -DKDE -o $@ $< 
 	${cleanupdeps}
 
-obj/qt/%.o: %.cpp
+obj/qt/%.o: %.c
 	@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
 	$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${QT_CFLAGS} -DKDE -o $@ $< 
 	${cleanupdeps}
diff --git a/Makefile.init.in b/Makefile.init.in
index 4ecfb9ddd8..2b1576db63 100644
--- a/Makefile.init.in
+++ b/Makefile.init.in
@@ -21,6 +21,7 @@ sysconfdir=@sysconfdir@
 includedir=@includedir@
 
 CC           = @CC@
+C++          = @C++@
 CFLAGS       = @CFLAGS@
 CPPFLAGS     = @CPPFLAGS@
 INSTALL      = @INSTALL@