diff options
| -rw-r--r-- | embed/xulrunner/embed/Makefile.am | 2 | ||||
| -rw-r--r-- | embed/xulrunner/src/Makefile.am | 2 | ||||
| -rw-r--r-- | embed/xulrunner/utils/EphyUtils.cpp (renamed from embed/xulrunner/embed/EphyUtils.cpp) | 4 | ||||
| -rw-r--r-- | embed/xulrunner/utils/EphyUtils.h (renamed from embed/xulrunner/embed/EphyUtils.h) | 0 | ||||
| -rw-r--r-- | embed/xulrunner/utils/GeckoUtils.cpp (renamed from embed/xulrunner/src/GeckoUtils.cpp) | 0 | ||||
| -rw-r--r-- | embed/xulrunner/utils/GeckoUtils.h (renamed from embed/xulrunner/src/GeckoUtils.h) | 0 | ||||
| -rw-r--r-- | embed/xulrunner/utils/Makefile.am | 5 |
7 files changed, 5 insertions, 8 deletions
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am index d7c9bd503..3fcc011fc 100644 --- a/embed/xulrunner/embed/Makefile.am +++ b/embed/xulrunner/embed/Makefile.am @@ -13,8 +13,6 @@ libephyxulrunnerembed_la_SOURCES = \ EphyHistoryListener.h \ EphySingle.cpp \ EphySingle.h \ - EphyUtils.cpp \ - EphyUtils.h \ EventContext.cpp \ EventContext.h \ mozilla-download.cpp \ diff --git a/embed/xulrunner/src/Makefile.am b/embed/xulrunner/src/Makefile.am index ec9847849..0d205386a 100644 --- a/embed/xulrunner/src/Makefile.am +++ b/embed/xulrunner/src/Makefile.am @@ -93,8 +93,6 @@ libgnomegeckoembed_la_SOURCES = \ GeckoBrowser.h \ GeckoSingle.cpp \ GeckoSingle.h \ - GeckoUtils.cpp \ - GeckoUtils.h \ $(NULL) libgnomegeckoembed_la_CPPFLAGS = \ diff --git a/embed/xulrunner/embed/EphyUtils.cpp b/embed/xulrunner/utils/EphyUtils.cpp index af030d6f5..a433294c8 100644 --- a/embed/xulrunner/embed/EphyUtils.cpp +++ b/embed/xulrunner/utils/EphyUtils.cpp @@ -40,10 +40,6 @@ #include <nsServiceManagerUtils.h> #include <nsXPCOM.h> -#include "ephy-embed-shell.h" -#include "ephy-embed-single.h" -#include "ephy-file-helpers.h" - #include "EphyUtils.h" nsresult diff --git a/embed/xulrunner/embed/EphyUtils.h b/embed/xulrunner/utils/EphyUtils.h index 65b1edb04..65b1edb04 100644 --- a/embed/xulrunner/embed/EphyUtils.h +++ b/embed/xulrunner/utils/EphyUtils.h diff --git a/embed/xulrunner/src/GeckoUtils.cpp b/embed/xulrunner/utils/GeckoUtils.cpp index c71fce4ba..c71fce4ba 100644 --- a/embed/xulrunner/src/GeckoUtils.cpp +++ b/embed/xulrunner/utils/GeckoUtils.cpp diff --git a/embed/xulrunner/src/GeckoUtils.h b/embed/xulrunner/utils/GeckoUtils.h index 05012e6b2..05012e6b2 100644 --- a/embed/xulrunner/src/GeckoUtils.h +++ b/embed/xulrunner/utils/GeckoUtils.h diff --git a/embed/xulrunner/utils/Makefile.am b/embed/xulrunner/utils/Makefile.am index faeab4716..ef773f3fb 100644 --- a/embed/xulrunner/utils/Makefile.am +++ b/embed/xulrunner/utils/Makefile.am @@ -9,9 +9,14 @@ libephyxulrunnerutils_la_SOURCES = \ AutoWindowModalState.h \ EphyBadCertRejector.cpp \ EphyBadCertRejector.h \ + EphyUtils.cpp \ + EphyUtils.h \ + GeckoUtils.cpp \ + GeckoUtils.h \ $(NULL) libephyxulrunnerutils_la_CPPFLAGS = \ + -I$(top_srcdir)/embed/xulrunner/src \ $(LIBXUL_CXXCPPFLAGS) \ $(LIBXUL_INCLUDES) \ $(AM_CPPFLAGS) |