aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/Makefile.am20
-rw-r--r--embed/ephy-embed-factory.c40
2 files changed, 4 insertions, 56 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 7e93fe444..b472219bf 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -1,6 +1,4 @@
-SUBDIRS = $(with_engine)
-
-DIST_SUBDIRS = xulrunner mozilla webkit
+SUBDIRS = webkit
NULL =
@@ -89,23 +87,9 @@ libephyembedfactory_la_SOURCES = \
ephy-embed-factory.h
libephyembedfactory_la_CPPFLAGS = \
- -I$(top_srcdir)/embed/$(with_engine) \
+ -I$(top_srcdir)/embed/webkit \
$(AM_CPPFLAGS)
-if WITH_XULRUNNER_ENGINE
-libephyembedfactory_la_CPPFLAGS += \
- -I$(srcdir)/xulrunner/src \
- -I$(srcdir)/xulrunner/embed \
- -I$(top_builddir)/embed/xulrunner/src \
- -I$(top_builddir)/embed/xulrunner/embed \
- $(LIBXUL_INCLUDES) \
- $(NULL)
-endif
-
-if WITH_GECKO_ENGINE
-libephyembedfactory_la_CPPFLAGS += -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz
-endif
-
libephyembedfactory_la_CFLAGS = \
$(GECKO_CFLAGS) \
$(DEPENDENCIES_CFLAGS) \
diff --git a/embed/ephy-embed-factory.c b/embed/ephy-embed-factory.c
index 6a80faf41..5aacc9f59 100644
--- a/embed/ephy-embed-factory.c
+++ b/embed/ephy-embed-factory.c
@@ -21,22 +21,10 @@
#include "config.h"
#include "ephy-embed-factory.h"
-#if defined(WITH_XULRUNNER_ENGINE)
-#include "mozilla-embed.h"
-#include "mozilla-embed-find.h"
-#include "mozilla-embed-persist.h"
-#include "mozilla-embed-single.h"
-#elif defined(WITH_GECKO_ENGINE)
-#include "mozilla-embed.h"
-#include "mozilla-embed-find.h"
-#include "mozilla-embed-persist.h"
-#include "mozilla-embed-single.h"
-#elif defined(WITH_WEBKIT_ENGINE)
#include "webkit-embed.h"
#include "webkit-embed-find.h"
#include "webkit-embed-persist.h"
#include "webkit-embed-single.h"
-#endif
#include "ephy-embed.h"
#include "ephy-embed-find.h"
#include "ephy-embed-persist.h"
@@ -57,43 +45,19 @@ ephy_embed_factory_new_object (GType type)
if (type == EPHY_TYPE_EMBED)
{
-#if defined(WITH_XULRUNNER_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED, NULL);
-#elif defined(WITH_GECKO_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
- object = g_object_new (WEBKIT_TYPE_EMBED, NULL);
-#endif
+ object = g_object_new (WEBKIT_TYPE_EMBED, NULL);
}
else if (type == EPHY_TYPE_EMBED_PERSIST)
{
-#if defined(WITH_XULRUNNER_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL);
-#elif defined(WITH_GECKO_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
- object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL);
-#endif
+ object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL);
}
else if (type == EPHY_TYPE_EMBED_FIND)
{
-#if defined(WITH_XULRUNNER_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL);
-#elif defined(WITH_GECKO_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
object = g_object_new (WEBKIT_TYPE_EMBED_FIND, NULL);
-#endif
}
else if (type == EPHY_TYPE_EMBED_SINGLE)
{
-#if defined(WITH_XULRUNNER_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL);
-#elif defined(WITH_GECKO_ENGINE)
- object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
object = g_object_new (WEBKIT_TYPE_EMBED_SINGLE, NULL);
-#endif
}
else
{