From e210a16d3179950ebb6774c16e2eccd508bf17e7 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 21 Jan 2007 23:02:09 +0100 Subject: [PATCH] Revert "Use mozilla-config.h when necessary." This reverts commit a07eef0ab05900113e9c39be4597ef1b8ea401be. --- lib/python/Makefile.am | 1 - lib/src/GeckoContentHandler.cpp | 2 -- lib/src/GeckoDownload.cpp | 2 -- lib/src/Makefile.am | 1 - lib/src/sugar-browser.cpp | 2 -- 5 files changed, 8 deletions(-) diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am index b5e9c288..6f28d335 100644 --- a/lib/python/Makefile.am +++ b/lib/python/Makefile.am @@ -12,7 +12,6 @@ pkgpyexec_LTLIBRARIES = _sugar.la _sugar_la_LDFLAGS = -module -avoid-version -R$(MOZILLA_HOME) _sugar_la_LIBADD = \ $(LIB_LIBS) \ - $(GECKO_LIBS) \ $(PYCAIRO_LIBS) \ $(top_builddir)/lib/src/libsugarprivate.la diff --git a/lib/src/GeckoContentHandler.cpp b/lib/src/GeckoContentHandler.cpp index a19cdc3d..4d9de8e7 100644 --- a/lib/src/GeckoContentHandler.cpp +++ b/lib/src/GeckoContentHandler.cpp @@ -1,5 +1,3 @@ -#include "mozilla-config.h" - #include #include diff --git a/lib/src/GeckoDownload.cpp b/lib/src/GeckoDownload.cpp index 35993d7d..66eb7c8f 100644 --- a/lib/src/GeckoDownload.cpp +++ b/lib/src/GeckoDownload.cpp @@ -1,5 +1,3 @@ -#include "mozilla-config.h" - #include "sugar-download-manager.h" #include "GeckoDownload.h" diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index da291fd1..50ee2e2e 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -10,7 +10,6 @@ libsugarprivate_la_CPPFLAGS = \ noinst_LTLIBRARIES = libsugarprivate.la libsugarprivate_la_LIBADD = $(LIB_LIBS) \ - $(GECKO_LIBS) \ -lgstinterfaces-0.10 \ -lgstaudio-0.10 diff --git a/lib/src/sugar-browser.cpp b/lib/src/sugar-browser.cpp index 56082490..dfd05d7b 100644 --- a/lib/src/sugar-browser.cpp +++ b/lib/src/sugar-browser.cpp @@ -17,8 +17,6 @@ * Boston, MA 02111-1307, USA. */ -#include "mozilla-config.h" - #include "sugar-browser.h" #include "GeckoContentHandler.h" #include "GeckoDownload.h"