Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2005-07-07 00:16:17 (GMT)
committer Marco Pesenti Gritti <marco@src.gnome.org>2005-07-07 00:16:17 (GMT)
commitc6c3e49776af18ae7a8ce433ac31121a0cdfbc6d (patch)
treed475bc4ef73035e6e392ebc41363e54fb313f6a0
parent02383ed04e6a5c215d6d3d4b961bc73b58a23b37 (diff)
*** empty log message ***
-rw-r--r--ChangeLog20
-rw-r--r--backend/Makefile.am7
-rw-r--r--configure.ac109
-rw-r--r--cut-n-paste/recent-files/Makefile.am4
-rw-r--r--cut-n-paste/toolbar-editor/Makefile.am4
-rw-r--r--cut-n-paste/zoom-control/Makefile.am5
-rw-r--r--lib/Makefile.am7
-rw-r--r--pdf/Makefile.am7
-rw-r--r--pixbuf/Makefile.am6
-rw-r--r--properties/Makefile.am5
-rw-r--r--ps/Makefile.am27
-rw-r--r--shell/Makefile.am3
-rw-r--r--thumbnailer/Makefile.am3
-rw-r--r--tiff/Makefile.am2
14 files changed, 92 insertions, 117 deletions
diff --git a/ChangeLog b/ChangeLog
index 77b6d6d..21727df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
+ * backend/Makefile.am:
+ * configure.ac:
+ * cut-n-paste/recent-files/Makefile.am:
+ * cut-n-paste/toolbar-editor/Makefile.am:
+ * cut-n-paste/zoom-control/Makefile.am:
+ * lib/Makefile.am:
+ * pdf/Makefile.am:
+ * pixbuf/Makefile.am:
+ * properties/Makefile.am:
+ * ps/Makefile.am:
+ * shell/Makefile.am:
+ * thumbnailer/Makefile.am:
+ * tiff/Makefile.am:
+
+ Use gnome-common macros when possible.
+ Cleanup dependencies.
+ Actually disable deprecated where possible.
+
+2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
+
* Makefile.am:
* backend/Makefile.am:
* properties/Makefile.am:
diff --git a/backend/Makefile.am b/backend/Makefile.am
index aa54b84..391a9de 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -9,8 +9,9 @@ INCLUDES= \
-I$(top_srcdir)/ps \
-I$(top_srcdir)/djvu \
-I$(top_srcdir)/dvi \
- $(SHELL_CFLAGS) \
- $(EVINCE_DISABLE_DEPRECATED) \
+ $(BACKEND_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(NULL)
noinst_LTLIBRARIES = libevbackend.la
@@ -49,7 +50,7 @@ libevbackend_la_SOURCES= \
libevbackend_la_LIBADD = \
$(top_builddir)/pdf/libpdfdocument.la \
$(top_builddir)/pixbuf/libpixbufdocument.la \
- $(top_builddir)/ps/libgtkgs.la \
+ $(top_builddir)/ps/libpsdocument.la \
$(NULL)
if ENABLE_DJVU
diff --git a/configure.ac b/configure.ac
index f9c3b12..a9231f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,10 @@ AC_PREREQ(2.57)
AC_INIT(evince, 0.3.2)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
+GNOME_COMMON_INIT
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS
+GNOME_CXX_WARNINGS
AM_CONFIG_HEADER(config.h)
@@ -34,18 +36,22 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
POPPLER_REQUIRED=0.3.3
DBUS_GLIB_REQUIRED=0.33
-
-PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0)
-PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0)
-PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0)
-PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= 2.4.0)
-PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED)
-PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 poppler-glib >= $POPPLER_REQUIRED)
-PKG_CHECK_MODULES(PROPERTIES, gtk+-2.0 >= 2.6.0 libglade-2.0 poppler-glib >= $POPPLER_REQUIRED)
-PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
-PKG_CHECK_MODULES(PS, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeui-2.0)
-PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED)
+GTK_REQUIRED=2.6.0
+LIBGNOMEUI_REQUIRED=2.6.0
+
+PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED)
+PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
+PKG_CHECK_MODULES(PROPERTIES, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0)
+PKG_CHECK_MODULES(DVI, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(PS, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(PDF, gtk+-2.0 >= $GTK_REQUIRED poppler-glib >= $POPPLER_REQUIRED)
+PKG_CHECK_MODULES(PIXBUF, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(TIFF, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
@@ -99,29 +105,6 @@ if test x$HAVE_NAUTILUS = "xyes"; then
fi
AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
-dnl Compile with disable-deprecated switches
-
-AC_ARG_ENABLE(deprecated,
-AC_HELP_STRING([--disable-deprecated],
- [Don't allow any deprecated GTK+/etc. features.]),
-set_enable_deprecated="$enableval",[
-if test -f $srcdir/autogen.sh; then
- is_cvs_version=true
- set_enable_deprecated=no
-else
- set_enable_deprecated=yes
- fi
-])
-AC_MSG_CHECKING([whether to disable deprecated glib/gtk+/etc. features])
-if test "$set_enable_deprecated" != "yes"; then
- AC_MSG_RESULT(yes)
- EVINCE_DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED"
-else
- AC_MSG_RESULT(no)
- EVINCE_DISABLE_DEPRECATED=""
-fi
-AC_SUBST(EVINCE_DISABLE_DEPRECATED)
-
evince_save_LIBS=$LIBS
LIBS="$LIBS $GTK_LIBS"
AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
@@ -270,58 +253,6 @@ if test "x$enable_tiff" = "xyes"; then
fi
AC_SUBST(EVINCE_MIME_TYPES)
-dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-dnl stolen from nautilus and gnome-common
-
-AC_ARG_ENABLE(more-warnings,
-[ --enable-more-warnings Maximum compiler warnings],
-set_more_warnings="$enableval",[
-if test -f $srcdir/autogen.sh; then
- is_cvs_version=true
- set_more_warnings=yes
-else
- set_more_warnings=no
-fi
-])
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- AC_MSG_RESULT([yes, using gcc])
- CFLAGS="\
- -Wall \
- -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
- -Wnested-externs -Wpointer-arith \
- -Wcast-align -Wsign-compare \
- -Werror \
- $CFLAGS"
-
-dnl case " $CFLAGS " in
-dnl *[\ \ ]-ansi[\ \ ]*) ;;
-dnl *) CFLAGS="$CFLAGS -ansi" ;;
-dnl esac
-dnl case " $CFLAGS " in
-dnl *[\ \ ]-pedantic[\ \ ]*) ;;
-dnl *) CFLAGS="$CFLAGS -pedantic" ;;
-dnl esac
-
- for option in -Wno-strict-aliasing -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [],
- has_option=yes,
- has_option=no,)
- if test $has_option = no; then
- CFLAGS="$SAVE_CFLAGS"
- fi
- AC_MSG_RESULT($has_option)
- unset has_option
- unset SAVE_CFLAGS
- done
- unset option
-else
- AC_MSG_RESULT(no)
-fi
-
AC_OUTPUT([
Makefile
cut-n-paste/Makefile
diff --git a/cut-n-paste/recent-files/Makefile.am b/cut-n-paste/recent-files/Makefile.am
index 3373508..fc00718 100644
--- a/cut-n-paste/recent-files/Makefile.am
+++ b/cut-n-paste/recent-files/Makefile.am
@@ -2,10 +2,10 @@ NULL =
INCLUDES = \
$(RECENT_FILES_CFLAGS) \
+ $(WARN_CFLAGS) \
$(NULL)
-# Uses the deprecated GnomeIconTheme
-# $(EVINCE_DISABLE_DEPRECATED)
+# $(DISABLE_DEPRECATED)
EGG_FILES = \
egg-recent-model.c \
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 1c9a09d..c2b86e6 100644
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -20,12 +20,16 @@ libtoolbareditor_la_SOURCES = \
$(EGGSOURCES) \
$(EGGHEADERS)
+libtoolbareditor_la_LIBADD = $(TOOLBAR_EDITOR_LIBS)
+
libtoolbareditor_la_CPPFLAGS = \
-I$(top_builddir)/lib/egg \
$(AM_CPPFLAGS)
libtoolbareditor_la_CFLAGS = \
$(TOOLBAR_EDITOR_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
-DCURSOR_DIR=\"$(pkgdatadir)\" \
$(AM_CFLAGS)
diff --git a/cut-n-paste/zoom-control/Makefile.am b/cut-n-paste/zoom-control/Makefile.am
index fa8ec2c..ec8737f 100644
--- a/cut-n-paste/zoom-control/Makefile.am
+++ b/cut-n-paste/zoom-control/Makefile.am
@@ -14,9 +14,12 @@ libephywidgets_la_CPPFLAGS = \
libephywidgets_la_CFLAGS = \
$(ZOOM_CONTROL_CFLAGS) \
+ $(WARNING_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
libephywidgets_la_LIBADD = \
+ $(ZOOM_CONTROL_LIBS)
libephymisc.la
NOINST_H_FILES = \
@@ -33,4 +36,4 @@ libephymisc_la_CPPFLAGS = \
libephymisc_la_CFLAGS = \
$(ZOOM_CONTROL_CFLAGS) \
- $(AM_CFLAGS) \ No newline at end of file
+ $(AM_CFLAGS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index adf16f1..f425bee 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,8 +3,9 @@ NULL=
INCLUDES= \
-DEVINCE_UIDIR=\"$(pkgdatadir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- $(SHELL_CFLAGS) \
- $(EVINCE_DISABLE_DEPRECATED) \
+ $(LIB_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(NULL)
noinst_LTLIBRARIES = libev.la
@@ -17,3 +18,5 @@ libev_la_SOURCES= \
ev-gui.c \
ev-gui.h \
$(NULL)
+
+libev_la_LIBADD = $(LIB_LIBS)
diff --git a/pdf/Makefile.am b/pdf/Makefile.am
index 14a3210..a2fdea8 100644
--- a/pdf/Makefile.am
+++ b/pdf/Makefile.am
@@ -1,8 +1,9 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/backend \
- $(POPPLER_GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
+ $(PDF_CFLAGS) \
+ $(WARN_CXXFLAGS) \
+ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\"
noinst_LTLIBRARIES = libpdfdocument.la
@@ -11,4 +12,4 @@ libpdfdocument_la_SOURCES = \
ev-poppler.cc \
ev-poppler.h
-
+libpdfdocument_la_LIBADD = $(PDF_LIBS)
diff --git a/pixbuf/Makefile.am b/pixbuf/Makefile.am
index 68d87dc..afa551b 100644
--- a/pixbuf/Makefile.am
+++ b/pixbuf/Makefile.am
@@ -1,11 +1,13 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/backend \
- $(GTK_CFLAGS) \
+ $(PIXBUF_CFLAGS) \
-DDATADIR=\""$(datadir)"\"
noinst_LTLIBRARIES = libpixbufdocument.la
-libpixbufdocument_la_SOURCES = \
+libpixbufdocument_la_SOURCES = \
pixbuf-document.c \
pixbuf-document.h
+
+libpixbufdocument_la_LIBADD = $(PIXBUF_LIBS)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index b5864b1..b0f39e1 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -6,7 +6,8 @@ INCLUDES= \
-I$(top_srcdir)/backend \
$(PROPERTIES_CFLAGS) \
$(NAUTILUS_CFLAGS) \
- $(EVINCE_DISABLE_DEPRECATED) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS) \
$(NULL)
noinst_LTLIBRARIES = libevproperties.la
@@ -16,6 +17,8 @@ libevproperties_la_SOURCES= \
ev-properties-view.h \
$(NULL)
+libevproperties_la_LIBADD = $(PROPERTIES_LIBS)
+
if HAVE_NAUTILUS
EVINCE_PROPERTIES_PAGE = libevince-properties-page.la
else
diff --git a/ps/Makefile.am b/ps/Makefile.am
index 6ebc896..df66b4a 100644
--- a/ps/Makefile.am
+++ b/ps/Makefile.am
@@ -3,17 +3,22 @@ INCLUDES = \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/lib \
-DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \
- $(PS_CFLAGS)
+ $(PS_CFLAGS) \
+ $(WARN_CFLAGS)
-noinst_LTLIBRARIES = libgtkgs.la
+# $(DISABLE_DEPRECATED)
-libgtkgs_la_SOURCES = \
- gsio.c \
- gsio.h \
- gstypes.h \
- ps.c \
- ps.h \
- ps-document.c \
- ps-document.h \
- gsdefaults.c \
+noinst_LTLIBRARIES = libpsdocument.la
+
+libpsdocument_la_SOURCES = \
+ gsio.c \
+ gsio.h \
+ gstypes.h \
+ ps.c \
+ ps.h \
+ ps-document.c \
+ ps-document.h \
+ gsdefaults.c \
gsdefaults.h
+
+libpsdocument_la_LIBADD = $(PS_LIBS)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 80b6ea5..a95b57d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -12,7 +12,8 @@ INCLUDES= \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
$(SHELL_CFLAGS) \
- $(EVINCE_DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(NULL)
if ENABLE_DBUS
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 6b57a2c..84adf10 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -9,7 +9,8 @@ INCLUDES= \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
$(THUMBNAILER_CFLAGS) \
- $(EVINCE_DISABLE_DEPRECATED) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS) \
$(NULL)
bin_PROGRAMS=evince-thumbnailer
diff --git a/tiff/Makefile.am b/tiff/Makefile.am
index 8919951..4290e1c 100644
--- a/tiff/Makefile.am
+++ b/tiff/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/backend \
- $(GTK_CFLAGS) \
+ $(TIFF_CFLAGS) \
-DDATADIR=\""$(datadir)"\"
noinst_LTLIBRARIES = libtiffdocument.la