yelp r3156 - in branches/webkit: . src

[atoker svn gnome org]

Author: atoker
Date: Fri Jul 18 19:56:35 2008
New Revision: 3156
URL: http://svn.gnome.org/viewvc/yelp?rev=3156&view=rev

Log:
Remove remaining C++ use


Added:
   branches/webkit/src/yelp-html.c
      - copied unchanged from r3155, /branches/webkit/src/yelp-html.cpp
Removed:
   branches/webkit/src/Yelper.cpp
   branches/webkit/src/Yelper.h
   branches/webkit/src/yelp-html.cpp
Modified:
   branches/webkit/configure.in
   branches/webkit/src/Makefile.am

Modified: branches/webkit/configure.in
==============================================================================
--- branches/webkit/configure.in	(original)
+++ branches/webkit/configure.in	Fri Jul 18 19:56:35 2008
@@ -17,7 +17,6 @@
 
 AC_PROG_LN_S
 AC_PROG_CC
-AC_PROG_CXX
 AM_PROG_CC_STDC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -28,13 +27,9 @@
 
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
-GNOME_CXX_WARNINGS
 
 MORE_WARN_FLAGS=
 DEPRECATION_FLAGS=
-if test "x$GCC" = "xyes"; then
-  MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
-fi
 
 if test "x$enable_debug" = "xyes"; then
 	AC_DEFINE([YELP_DEBUG],[1],[Enable Yelp debugging])
@@ -220,9 +215,6 @@
   AC_SUBST(YELP_WEBKIT_LIBS)
   AC_DEFINE(WEBKIT_BACKEND, 1, [Webkit Backend])
 
-### Gecko does demand a lot of things here, doesn't it?
-
-
 
 # More flags
 AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
@@ -231,7 +223,6 @@
 
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([

Modified: branches/webkit/src/Makefile.am
==============================================================================
--- branches/webkit/src/Makefile.am	(original)
+++ branches/webkit/src/Makefile.am	Fri Jul 18 19:56:35 2008
@@ -5,7 +5,7 @@
 	yelp-bookmarks.c 	yelp-bookmarks.h		\
 	yelp-debug.c		yelp-debug.h			\
 	yelp-error.c		yelp-error.h			\
-	yelp-html.cpp		yelp-html.h			\
+	yelp-html.c			yelp-html.h			\
 	yelp-io-channel.c	yelp-io-channel.h		\
 	yelp-settings.c		yelp-settings.h			\
 	yelp-utils.c		yelp-utils.h			\
@@ -51,12 +51,6 @@
 	$(AM_CFLAGS)			\
 	$(YELP_WEBKIT_CFLAGS)
 
-yelp_CXXFLAGS =				\
-	$(YELP_CFLAGS)			\
-	$(YELP_SEARCH_CFLAGS)		\
-	$(YELP_WEBKIT_CFLAGS)		\
-	$(AM_CXXFLAGS)
-
 yelp_LDADD =				\
 	$(YELP_LIBS)			\
 	$(YELP_SEARCH_LIBS)		\