aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog26
-rw-r--r--configure.ac20
-rw-r--r--doc/reference/Makefile.am2
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml2
-rw-r--r--embed/Makefile.am38
-rw-r--r--embed/mozilla/Makefile.am128
-rw-r--r--lib/Makefile.am19
-rw-r--r--lib/eel-gconf-extensions.c13
-rw-r--r--lib/egg/Makefile.am65
-rw-r--r--lib/egg/eggintl.h2
-rw-r--r--lib/widgets/Makefile.am23
-rw-r--r--src/Makefile.am56
-rw-r--r--src/bookmarks/Makefile.am33
-rw-r--r--src/ephy-main.c2
14 files changed, 253 insertions, 176 deletions
diff --git a/ChangeLog b/ChangeLog
index b6999ef44..100417409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2004-12-01 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+
+ Add deprecated defines to AM_CPPFLAGS in maintainer-mode.
+
+ * doc/reference/Makefile.am:
+ * embed/Makefile.am:
+ * embed/mozilla/Makefile.am:
+ * lib/Makefile.am:
+ * lib/egg/Makefile.am:
+ * lib/egg/eggintl.h:
+ * lib/widgets/Makefile.am:
+ * src/Makefile.am:
+ * src/bookmarks/Makefile.am:
+
+ INCLUDES is deprecated, use AM_CPPFLAGS and AM_CFLAGS instead.
+
+ * lib/eel-gconf-extensions.c: (eel_gconf_client_get_global):
+
+ Removed usage of deprecated gconf API.
+
+ * src/ephy-main.c: (main):
+
+ Removed usage of deprecated glade API.
+
2004-11-29 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-window.c:
diff --git a/configure.ac b/configure.ac
index 3530d6069..efd499dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,12 +27,18 @@ AC_CONFIG_SRCDIR([configure.ac])
EPIPHANY_MAJOR=1.5
AC_SUBST([EPIPHANY_MAJOR])
-AM_INIT_AUTOMAKE([dist-bzip2 check-news])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news])
dnl AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
AM_MAINTAINER_MODE
+if test "x$enable_maintainer_mode" = "xyes"; then
+ AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
+ enable_debug=yes
+ AM_CPPFLAGS="$AM_CPPFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+fi
AC_PROG_INTLTOOL([0.29])
@@ -65,12 +71,17 @@ AM_PROG_CC_STDC
AC_HEADER_STDC
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([error])
+dnl GNOME_CXX_WARNINGS
+AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
-PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], \
+PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
glib-2.0 >= $GLIB_REQUIRED \
pango >= $PANGO_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
@@ -83,7 +94,7 @@ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], \
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED \
gnome-vfs-module-2.0 \
gconf-2.0 \
- )
+ ])
AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
@@ -411,9 +422,6 @@ elif test "x$flavour" = "xtoolkit"; then
[Define if mozilla nsIPassword header is available])])
fi
-MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
-AC_SUBST([MOZILLA_WARN_CXXFLAGS])
-
AC_MSG_CHECKING([whether to enable native gtk+ filepicker])
AC_ARG_ENABLE([filepicker],
AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not neede when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 8efbdf7d2..393985564 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.6
+AUTOMAKE_OPTIONS = 1.9
INCLUDES = $(MOZILLA_COMPONENT_CFLAGS) \
-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index f5fb528eb..7279ec5af 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -175,6 +175,8 @@ be done by casting).
@:
@:
@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 893575963..b1435d0f6 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -1,20 +1,5 @@
SUBDIRS = mozilla
-INCLUDES = \
- -I$(top_srcdir)/embed/mozilla \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/egg \
- -I$(top_srcdir)/lib/widgets \
- -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\"
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
-endif
-
noinst_LTLIBRARIES = libephyembed.la libephyembedfactory.la
headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
@@ -64,6 +49,29 @@ libephyembed_la_SOURCES = \
$(INST_H_FILES) \
$(NOINST_H_FILES)
+libephyembed_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/embed/mozilla \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ $(AM_CPPFLAGS)
+
+libephyembed_la_CFLAGS = \
+ -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
+
libephyembedfactory_la_SOURCES = \
ephy-embed-factory.c \
ephy-embed-factory.h
+
+libephyembedfactory_la_CPPFLAGS = \
+ -I$(top_srcdir)/embed/mozilla \
+ -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
+ $(AM_CPPFLAGS)
+
+libephyembedfactory_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index ec3913a64..918af1f8e 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -1,50 +1,3 @@
-INCLUDES = \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/embed \
- -I$(top_srcdir) \
- $(MOZILLA_COMPONENT_CFLAGS) \
- -I$(MOZILLA_INCLUDE_ROOT) \
- -I$(MOZILLA_INCLUDE_ROOT)/caps \
- -I$(MOZILLA_INCLUDE_ROOT)/chardet \
- -I$(MOZILLA_INCLUDE_ROOT)/commandhandler \
- -I$(MOZILLA_INCLUDE_ROOT)/content \
- -I$(MOZILLA_INCLUDE_ROOT)/cookie \
- -I$(MOZILLA_INCLUDE_ROOT)/docshell \
- -I$(MOZILLA_INCLUDE_ROOT)/dom \
- -I$(MOZILLA_INCLUDE_ROOT)/exthandler \
- -I$(MOZILLA_INCLUDE_ROOT)/gfx \
- -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
- -I$(MOZILLA_INCLUDE_ROOT)/js \
- -I$(MOZILLA_INCLUDE_ROOT)/history \
- -I$(MOZILLA_INCLUDE_ROOT)/layout \
- -I$(MOZILLA_INCLUDE_ROOT)/locale \
- -I$(MOZILLA_INCLUDE_ROOT)/mimetype \
- -I$(MOZILLA_INCLUDE_ROOT)/necko \
- -I$(MOZILLA_INCLUDE_ROOT)/nkcache \
- -I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
- -I$(MOZILLA_INCLUDE_ROOT)/pipboot \
- -I$(MOZILLA_INCLUDE_ROOT)/pipnss \
- -I$(MOZILLA_INCLUDE_ROOT)/shistory \
- -I$(MOZILLA_INCLUDE_ROOT)/uriloader \
- -I$(MOZILLA_INCLUDE_ROOT)/uconv \
- -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \
- -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \
- -I$(MOZILLA_INCLUDE_ROOT)/widget \
- -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \
- -I$(MOZILLA_INCLUDE_ROOT)/xmlextras \
- -I$(MOZILLA_INCLUDE_ROOT)/xpcom \
- -I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
- -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
- -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
- -DALLOW_PRIVATE_API
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS)
-endif
-
noinst_LTLIBRARIES = libephymozillaembed.la
libephymozillaembed_la_SOURCES = \
@@ -102,3 +55,84 @@ libephymozillaembed_la_SOURCES += \
GtkNSSKeyPairDialogs.cpp \
GtkNSSKeyPairDialogs.h
endif
+
+mozilla_include_subdirs = \
+ caps \
+ chardet \
+ commandhandler \
+ content \
+ cookie \
+ docshell \
+ dom \
+ exthandler \
+ helperAppDlg \
+ gfx \
+ history \
+ js \
+ layout \
+ locale \
+ mimetype \
+ necko \
+ nkcache \
+ passwordmgr \
+ pipboot \
+ pipnss \
+ shistory \
+ uriloader \
+ uconv \
+ webbrowserpersist \
+ webbrwsr \
+ widget \
+ windowwatcher \
+ xmlextras \
+ xpcom \
+ xpconnect
+
+libephymozillaembed_la_CPPFLAGS = \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir) \
+ -I$(MOZILLA_INCLUDE_ROOT) \
+ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
+ -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
+ -DALLOW_PRIVATE_API \
+ $(AM_CPPFLAGS)
+
+libephymozillaembed_la_CXXFLAGS = \
+ $(MOZILLA_COMPONENT_CFLAGS) \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CXXFLAGS)
+
+# -I$(MOZILLA_INCLUDE_ROOT) \
+# -I$(MOZILLA_INCLUDE_ROOT)/caps \
+# -I$(MOZILLA_INCLUDE_ROOT)/chardet \
+# -I$(MOZILLA_INCLUDE_ROOT)/commandhandler \
+# -I$(MOZILLA_INCLUDE_ROOT)/content \
+# -I$(MOZILLA_INCLUDE_ROOT)/cookie \
+# -I$(MOZILLA_INCLUDE_ROOT)/docshell \
+# -I$(MOZILLA_INCLUDE_ROOT)/dom \
+# -I$(MOZILLA_INCLUDE_ROOT)/exthandler \
+# -I$(MOZILLA_INCLUDE_ROOT)/gfx \
+# -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
+# -I$(MOZILLA_INCLUDE_ROOT)/js \
+# -I$(MOZILLA_INCLUDE_ROOT)/history \
+# -I$(MOZILLA_INCLUDE_ROOT)/layout \
+# -I$(MOZILLA_INCLUDE_ROOT)/locale \
+# -I$(MOZILLA_INCLUDE_ROOT)/mimetype \
+# -I$(MOZILLA_INCLUDE_ROOT)/necko \
+# -I$(MOZILLA_INCLUDE_ROOT)/nkcache \
+# -I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
+# -I$(MOZILLA_INCLUDE_ROOT)/pipboot \
+# -I$(MOZILLA_INCLUDE_ROOT)/pipnss \
+# -I$(MOZILLA_INCLUDE_ROOT)/shistory \
+# -I$(MOZILLA_INCLUDE_ROOT)/uriloader \
+# -I$(MOZILLA_INCLUDE_ROOT)/uconv \
+# -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \
+# -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \
+# -I$(MOZILLA_INCLUDE_ROOT)/widget \
+# -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \
+# -I$(MOZILLA_INCLUDE_ROOT)/xmlextras \
+# -I$(MOZILLA_INCLUDE_ROOT)/xpcom \
+# -I$(MOZILLA_INCLUDE_ROOT)/xpconnect
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1a7dd3d65..aef41faca 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,15 +1,5 @@
SUBDIRS = widgets egg
-INCLUDES = \
- -I$(top_builddir)/lib \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\"
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
-endif
-
noinst_LTLIBRARIES = libephymisc.la
headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
@@ -68,6 +58,15 @@ libephymisc_la_SOURCES = \
$(INST_H_FILES) \
$(NOINST_H_FILES)
+libephymisc_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ $(AM_CPPFLAGS)
+
+libephymisc_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
+
BUILT_SOURCES=ephy-marshal.c ephy-marshal.h
CLEAN_FILES = $(BUILT_SOURCES)
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index c3c489702..7f616084d 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -29,6 +29,7 @@
#include "eel-gconf-extensions.h"
#include <glib/gi18n.h>
+
#include <gconf/gconf-client.h>
#include <gconf/gconf.h>
#include <string.h>
@@ -50,18 +51,6 @@ global_client_free (void)
GConfClient *
eel_gconf_client_get_global (void)
{
- /* Initialize gconf if needed */
- if (!gconf_is_initialized ()) {
- char *argv[] = { "eel-preferences", NULL };
- GError *error = NULL;
-
- if (!gconf_init (1, argv, &error)) {
- if (eel_gconf_handle_error (&error)) {
- return NULL;
- }
- }
- }
-
if (global_gconf_client == NULL) {
global_gconf_client = gconf_client_get_default ();
g_atexit (global_client_free);
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 4920ffbba..dc2f0c6e3 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -1,39 +1,40 @@
-INCLUDES = \
- -I$(top_builddir)/lib/egg \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DCURSOR_DIR=\"$(pkgdatadir)/art\" \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED
+EGGSOURCES = \
+ eggtreemultidnd.c \
+ egg-editable-toolbar.c \
+ egg-toolbars-model.c \
+ egg-toolbar-editor.c \
+ eggstatusicon.c \
+ eggtrayicon.c \
+ eggtraymanager.c
-noinst_LTLIBRARIES = libegg.la
+EGGHEADERS = \
+ eggtreemultidnd.h \
+ egg-editable-toolbar.h \
+ egg-toolbars-model.h \
+ egg-toolbar-editor.h \
+ eggstatusicon.h \
+ eggtrayicon.h \
+ eggtraymanager.h
-EGGSOURCES = \
- eggtreemultidnd.c \
- egg-editable-toolbar.c \
- egg-toolbars-model.c \
- egg-toolbar-editor.c \
- eggstatusicon.c \
- eggtrayicon.c \
- eggtraymanager.c
+noinst_HEADERS = \
+ $(EGGHEADERS) \
+ eggmarshalers.h \
+ eggintl.h
+
+noinst_LTLIBRARIES = libegg.la
libegg_la_SOURCES = \
- $(EGGSOURCES) \
- eggmarshalers.c
+ $(EGGSOURCES) \
+ eggmarshalers.c
-EGGHEADERS = \
- eggtreemultidnd.h \
- egg-editable-toolbar.h \
- egg-toolbars-model.h \
- egg-toolbar-editor.h \
- eggstatusicon.h \
- eggtrayicon.h \
- eggtraymanager.h
+libegg_la_CPPFLAGS = \
+ -I$(top_builddir)/lib/egg \
+ -DCURSOR_DIR=\"$(pkgdatadir)/art\" \
+ $(AM_CPPFLAGS)
-noinst_HEADERS = \
- $(EGGHEADERS) \
- eggmarshalers.h \
- eggintl.h
+libegg_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
BUILT_SOURCES = eggmarshalers.h eggmarshalers.c
@@ -41,7 +42,7 @@ eggmarshalers.h: eggmarshalers.list
$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h
eggmarshalers.c: eggmarshalers.list
- $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --body > eggmarshalers.c
+ $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c
EXTRA_DIST= \
eggmarshalers.list
@@ -52,3 +53,5 @@ EGGDIR=$(srcdir)/../../../libegg/libegg
regenerate-built-sources:
EGGFILES="$(EGGFILES) eggmarshalers.list" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEAN_FILES = $(BUILT_SOURCES)
diff --git a/lib/egg/eggintl.h b/lib/egg/eggintl.h
index 41d2b3d43..2b144c670 100644
--- a/lib/egg/eggintl.h
+++ b/lib/egg/eggintl.h
@@ -5,6 +5,6 @@
#include <config.h>
#endif
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#endif /* __EGG_INTL_H__ */
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 020d3e0b9..92c20183d 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,15 +1,3 @@
-INCLUDES = \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/egg \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\"
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
-endif
-
noinst_LTLIBRARIES = libephywidgets.la
libephywidgets_la_SOURCES = \
@@ -29,3 +17,14 @@ libephywidgets_la_SOURCES = \
ephy-zoom-action.c \
ephy-zoom-control.c \
ephy-zoom-control.h
+
+libephywidgets_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ $(AM_CPPFLAGS)
+
+libephywidgets_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index f61728381..a35aacfed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,5 @@
SUBDIRS = bookmarks
-INCLUDES = \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/embed \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/egg \
- -I$(top_srcdir)/lib/widgets \
- -I$(top_srcdir)/src/bookmarks \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
- -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DPIXMAP_DIR=\""$(datadir)/pixmaps"\"
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
-endif
-
noinst_LTLIBRARIES = libephymain.la
bin_PROGRAMS = epiphany
@@ -101,8 +83,44 @@ libephymain_la_SOURCES = \
$(INST_H_FILES) \
$(NOINST_H_FILES)
+libephymain_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/src/bookmarks \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
+ $(AM_CPPFLAGS)
+
+libephymain_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
+
epiphany_SOURCES = ephy-main.c
+epiphany_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/src/bookmarks \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
+ $(AM_CPPFLAGS)
+
+epiphany_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
+
+epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
+
epiphany_LDADD = \
$(top_builddir)/src/libephymain.la \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
@@ -116,8 +134,6 @@ epiphany_LDADD = \
$(EPIPHANY_DEPENDENCY_LIBS) \
$(INTLLIBS)
-epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
-
BUILT_SOURCES = $(CORBA_SOURCE)
CLEANFILES = $(CORBA_SOURCE)
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index df7a90e51..0644de0b8 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -1,27 +1,9 @@
-INCLUDES = \
- -I$(top_srcdir)/lib \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/embed \
- -I$(top_srcdir)/lib/widgets \
- -I$(top_srcdir)/lib/egg \
- $(WARN_CFLAGS) \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
- -DDATADIR=\""$(datadir)"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-if MAINTAINER_MODE
-INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
-endif
-
noinst_LTLIBRARIES = libephybookmarks.la
headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
header_DATA = $(INST_H_FILES)
-INST_H_FILES = \
+INST_H_FILES = \
ephy-bookmarks.h
NOINST_H_FILES = \
@@ -54,3 +36,16 @@ libephybookmarks_la_SOURCES = \
ephy-topics-selector.c \
$(NOINST_H_FILES) \
$(INST_H_FILES)
+
+libephybookmarks_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/lib/egg \
+ $(AM_CPPFLAGS)
+
+libephybookmarks_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 98d71f1c6..da9907fad 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -34,7 +34,6 @@
#include <libgnome/gnome-program.h>
#include <bonobo/bonobo-main.h>
#include <glib/gi18n.h>
-#include <glade/glade-init.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libxml/xmlversion.h>
@@ -160,7 +159,6 @@ main (int argc, char *argv[])
}
gnome_vfs_init ();
- glade_gnome_init ();
ephy_debug_init ();
ephy_file_helpers_init ();
ephy_stock_icons_init ();
generated by cgit (git 2.34.1) at 2024-11-12 03:04:11 +0800