Commit 91885d47 authored by Marco Pesenti Gritti's avatar Marco Pesenti Gritti

*** empty log message ***

parent 43192e4b
- Check that filtering is not done more than one time on bookmarks dialogs init
- change font size pref name or convert if possible
Downloader:
......@@ -11,5 +10,3 @@ in the renderer to something sane)
constructor/destructor. Verify that references are correct == objects
are destroyed at right time.
- Probably use cur from total instead of just total in the size field
- when porting to the new file picker get rid of FilePicker.cpp and
show the dialog in Sniffer, so we can have proper filename
......@@ -11,6 +11,8 @@ AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_MAINTAINER_MODE
dnl put the ACLOCAL flags in the Makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
......
......@@ -5,13 +5,13 @@ INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/widgets \
-I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
$(WARN_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED
-DSHARE_DIR=\"$(pkgdatadir)\"
if MAINTAINER_MODE
INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
noinst_LTLIBRARIES = libephyembed.la
......
......@@ -3,7 +3,6 @@ INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/embed \
-I$(top_srcdir) \
$(WARN_CXXFLAGS) \
$(MOZILLA_COMPONENT_CFLAGS) \
-I$(MOZILLA_INCLUDE_ROOT)/appcomps \
-I$(MOZILLA_INCLUDE_ROOT)/chardet \
......@@ -36,15 +35,15 @@ INCLUDES = \
-I$(MOZILLA_INCLUDE_ROOT)/widget \
-I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \
-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
$(GCONF_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
if MAINTAINER_MODE
INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CXXFLAGS)
endif
noinst_LTLIBRARIES = libephymozillaembed.la
libephymozillaembed_la_SOURCES = \
......
INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/egg \
$(WARN_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED
-DSHARE_DIR=\"$(pkgdatadir)\"
if MAINTAINER_MODE
INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
noinst_LTLIBRARIES = libephywidgets.la
......
......@@ -6,17 +6,17 @@ INCLUDES = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
$(WARN_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DEXTENSIONS_DIR=\""$(libdir)/epiphany/extensions"\" \
-DDATADIR=\""$(datadir)"\" \
-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
if MAINTAINER_MODE
INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
bin_PROGRAMS = epiphany-bin
bin_SCRIPTS = epiphany
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment