[asterisk-commits] russell: branch group/asterisk-cpp r168537 - /team/group/asterisk-cpp/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jan 13 08:25:00 2009
New Revision: 168537

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168537
Log:
main/ all compiles ... linker explodes.

Modified:
    team/group/asterisk-cpp/Makefile.rules

Modified: team/group/asterisk-cpp/Makefile.rules
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/Makefile.rules?view=diff&rev=168537&r1=168536&r2=168537
==============================================================================
--- team/group/asterisk-cpp/Makefile.rules (original)
+++ team/group/asterisk-cpp/Makefile.rules Tue Jan 13 08:25:00 2009
@@ -81,8 +81,13 @@
 
 ifneq ($(COMPILE_DOUBLE),yes)
 %.o: %.c
+ifeq ($(strip $(foreach dir,db1-ast editline,$(findstring $(dir),$(CURDIR)/$@))),)
+	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+else
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+endif
 endif
 
 %.i: %.c