diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | embed/Makefile.am | 12 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 11 | ||||
| -rw-r--r-- | lib/widgets/Makefile.am | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
6 files changed, 25 insertions, 27 deletions
@@ -1,5 +1,4 @@ - 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 diff --git a/configure.in b/configure.in index ad0c9a15c..6d7118f11 100644 --- a/configure.in +++ b/configure.in @@ -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" diff --git a/embed/Makefile.am b/embed/Makefile.am index f283889bd..b4290efe6 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -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 diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 485af100f..ab823f6ca 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -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 = \ diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index 17c02ef73..eda2cab80 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -1,13 +1,13 @@ 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 diff --git a/src/Makefile.am b/src/Makefile.am index 6124a0c8d..d30b39f7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 |