[evince] Add EV_INTLTOOL_EVINCE_BACKEND_RULE
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince] Add EV_INTLTOOL_EVINCE_BACKEND_RULE
- Date: Sun, 16 Aug 2009 20:05:18 +0000 (UTC)
commit 6928d325b767871772a9abd86e91456bcceb405a
Author: Christian Persch <chpe gnome org>
Date: Sun Aug 16 22:04:25 2009 +0200
Add EV_INTLTOOL_EVINCE_BACKEND_RULE
Create a rule for the .evince-backend file creation, and use that one
instead of hardcoding it in every Makefile.am. Use $(AM_V_GEN) in the
rule.
backend/comics/Makefile.am | 5 +----
backend/djvu/Makefile.am | 7 +------
backend/dvi/Makefile.am | 7 +------
backend/impress/Makefile.am | 5 ++---
backend/pdf/Makefile.am | 5 ++---
backend/pixbuf/Makefile.am | 5 ++---
backend/ps/Makefile.am | 5 ++---
backend/tiff/Makefile.am | 5 ++---
configure.ac | 8 +++++++-
libmisc/Makefile.am | 1 -
10 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index 34f1ad6..eae62f4 100644
--- a/backend/comics/Makefile.am
+++ b/backend/comics/Makefile.am
@@ -21,13 +21,10 @@ libcomicsdocument_la_LIBADD = \
$(LIB_LIBS)
backend_in_files = comicsdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
-
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index 9b460f4..4c39d2d 100644
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -27,15 +27,10 @@ libdjvudocument_la_LIBADD = \
$(DJVU_LIBS)
backend_in_files = djvudocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
-
-
-
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index 5a9d4df..0e27e11 100644
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -34,15 +34,10 @@ libdvidocument_la_LIBADD += -lt1
endif
backend_in_files = dvidocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
-
-
-
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am
index 02305f3..8057dfc 100644
--- a/backend/impress/Makefile.am
+++ b/backend/impress/Makefile.am
@@ -46,11 +46,10 @@ libimpressdocument_la_LIBADD = \
$(BACKEND_LIBS) -lz
backend_in_files = impressdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
+
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index 34103e6..1d2115a 100644
--- a/backend/pdf/Makefile.am
+++ b/backend/pdf/Makefile.am
@@ -23,11 +23,10 @@ libpdfdocument_la_LIBADD = \
$(CAIRO_PS_LIBS)
backend_in_files = pdfdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
+
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am
index 016ea8e..73beba3 100644
--- a/backend/pixbuf/Makefile.am
+++ b/backend/pixbuf/Makefile.am
@@ -19,11 +19,10 @@ libpixbufdocument_la_LIBADD = \
$(BACKEND_LIBS)
backend_in_files = pixbufdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
+
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index b6c21f6..9fa6252 100644
--- a/backend/ps/Makefile.am
+++ b/backend/ps/Makefile.am
@@ -21,11 +21,10 @@ libpsdocument_la_LIBADD = \
$(SPECTRE_LIBS)
backend_in_files = psdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
+
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index e236eca..81fc9bf 100644
--- a/backend/tiff/Makefile.am
+++ b/backend/tiff/Makefile.am
@@ -22,11 +22,10 @@ libtiffdocument_la_LIBADD = \
-ltiff
backend_in_files = tiffdocument.evince-backend.in
-
-%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
EXTRA_DIST = $(backend_in_files)
CLEANFILES = $(backend_DATA)
+
+ EV_INTLTOOL_EVINCE_BACKEND_RULE@
diff --git a/configure.ac b/configure.ac
index ee8b971..9278b4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_CXX
AC_STDC_HEADERS
-IT_PROG_INTLTOOL([0.35.0])
+
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
@@ -73,11 +73,17 @@ GNOME_CXX_WARNINGS
GTK_DOC_CHECK(1.0)
+IT_PROG_INTLTOOL([0.35.0])
+
GETTEXT_PACKAGE=evince
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
AM_GLIB_GNU_GETTEXT
+m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
+EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE])
+
# Check which platform to use
AC_MSG_CHECKING([for which platform to build])
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index 6187ca9..290f574 100644
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -17,4 +17,3 @@ libevmisc_la_CFLAGS = \
libevmisc_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument.la \
$(top_builddir)/libview/libevview.la
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]