evince r3352 - in trunk: . cut-n-paste/evmountoperation cut-n-paste/gedit-message-area cut-n-paste/gimpcellrenderertoggle cut-n-paste/smclient cut-n-paste/toolbar-editor cut-n-paste/totem-screensaver cut-n-paste/zoom-control libdocument

[carlosgc svn gnome org]

Author: carlosgc
Date: Sun Jan 18 15:31:03 2009
New Revision: 3352
URL: http://svn.gnome.org/viewvc/evince?rev=3352&view=rev

Log:
2009-01-18  Carlos Garcia Campos  <carlosgc gnome org>

	* configure.ac:
	* cut-n-paste/*/Makefile.am:
	* libdocument/Makefile.am:

	Rename LIB as LIBDOCUMENT and use SHELL_CORE for cut-n-paste
	code.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/cut-n-paste/evmountoperation/Makefile.am
   trunk/cut-n-paste/gedit-message-area/Makefile.am
   trunk/cut-n-paste/gimpcellrenderertoggle/Makefile.am
   trunk/cut-n-paste/smclient/Makefile.am
   trunk/cut-n-paste/toolbar-editor/Makefile.am
   trunk/cut-n-paste/totem-screensaver/Makefile.am
   trunk/cut-n-paste/zoom-control/Makefile.am
   trunk/libdocument/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan 18 15:31:03 2009
@@ -52,7 +52,7 @@
 GNOME_ICON_THEME_REQUIRED=2.17.1
 LIBXML_REQUIRED=2.5.0
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
@@ -129,10 +129,10 @@
 fi
 
 
-LIB_CFLAGS="$LIB_CFLAGS $DEBUG_FLAGS"
-LIB_LIBS="$LIB_LIBS"
-AC_SUBST(LIB_CFLAGS)
-AC_SUBST(LIB_LIBS)
+LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS"
+LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS"
+AC_SUBST(LIBDOCUMENT_CFLAGS)
+AC_SUBST(LIBDOCUMENT_LIBS)
 
 LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $DEBUG_FLAGS"
 LIBVIEW_LIBS="$LIBVIEW_LIBS"

Modified: trunk/cut-n-paste/evmountoperation/Makefile.am
==============================================================================
--- trunk/cut-n-paste/evmountoperation/Makefile.am	(original)
+++ trunk/cut-n-paste/evmountoperation/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -5,7 +5,6 @@
 	ev-mount-operation.c
 
 libevmountoperation_la_CFLAGS =		\
-	-I$(top_srcdir)/lib		\
-	$(LIB_CFLAGS)			\
+	$(SHELL_CORE_CFLAGS)		\
 	$(WARNING_CFLAGS)		\
 	$(DISABLE_DEPRECATED)
\ No newline at end of file

Modified: trunk/cut-n-paste/gedit-message-area/Makefile.am
==============================================================================
--- trunk/cut-n-paste/gedit-message-area/Makefile.am	(original)
+++ trunk/cut-n-paste/gedit-message-area/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -4,7 +4,6 @@
 	gedit-message-area.h
 
 libgeditmsgarea_la_CFLAGS =	\
-	-I$(top_srcdir)/lib	\
-	$(LIB_CFLAGS)		\
+	$(SHELL_CORE_CFLAGS)	\
 	$(WARNING_CFLAGS)	\
 	$(DISABLE_DEPRECATED)

Modified: trunk/cut-n-paste/gimpcellrenderertoggle/Makefile.am
==============================================================================
--- trunk/cut-n-paste/gimpcellrenderertoggle/Makefile.am	(original)
+++ trunk/cut-n-paste/gimpcellrenderertoggle/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -5,8 +5,7 @@
 	gimpcellrenderertoggle.c
 
 libgimpcellrenderertoggle_la_CFLAGS =	\
-	-I$(top_srcdir)/lib		\
-	$(LIB_CFLAGS)			\
+	$(SHELL_CORE_CFLAGS)		\
 	$(WARNING_CFLAGS)		\
 	$(DISABLE_DEPRECATED)
 

Modified: trunk/cut-n-paste/smclient/Makefile.am
==============================================================================
--- trunk/cut-n-paste/smclient/Makefile.am	(original)
+++ trunk/cut-n-paste/smclient/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -9,7 +9,6 @@
 	eggsmclient-xsmp.c
 
 libsmclient_la_CFLAGS =				\
-	-I$(top_srcdir)/lib			\
 	-DG_LOG_DOMAIN=\""EggSMClient"\"	\	
 	-DEGG_SM_CLIENT_BACKEND_XSMP		\
 	$(SMCLIENT_CFLAGS)			\

Modified: trunk/cut-n-paste/toolbar-editor/Makefile.am
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/Makefile.am	(original)
+++ trunk/cut-n-paste/toolbar-editor/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -20,11 +20,10 @@
 	$(EGGHEADERS) 
 
 libtoolbareditor_la_CPPFLAGS = \
-	-I$(top_builddir)/lib/egg		\
 	$(AM_CPPFLAGS)
 
 libtoolbareditor_la_CFLAGS = \
-	$(LIB_CFLAGS)				\
+	$(SHELL_CORE_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
 	-DCURSOR_DIR=\"$(pkgdatadir)\"		\

Modified: trunk/cut-n-paste/totem-screensaver/Makefile.am
==============================================================================
--- trunk/cut-n-paste/totem-screensaver/Makefile.am	(original)
+++ trunk/cut-n-paste/totem-screensaver/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -3,9 +3,8 @@
 	totem-scrsaver.h \
 	totem-scrsaver.c
 
-libtotemscrsaver_la_CFLAGS = \
-	-I$(top_srcdir)/lib	\
-	$(LIB_CFLAGS)		\
+libtotemscrsaver_la_CFLAGS = 	\
+	$(SHELL_CORE_CFLAGS)	\
 	$(DBUS_CFLAGS)		\
 	$(WARNING_CFLAGS)	\
 	$(DISABLE_DEPRECATED)

Modified: trunk/cut-n-paste/zoom-control/Makefile.am
==============================================================================
--- trunk/cut-n-paste/zoom-control/Makefile.am	(original)
+++ trunk/cut-n-paste/zoom-control/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -9,7 +9,6 @@
 	ephy-zoom.h
 
 libephyzoom_la_CFLAGS = \
-	-I$(top_srcdir)/lib	\
-	$(LIB_CFLAGS)		\
+	$(SHELL_CORE_CFLAGS)	\
 	$(WARNING_CFLAGS)	\
 	$(DISABLE_DEPRECATED)

Modified: trunk/libdocument/Makefile.am
==============================================================================
--- trunk/libdocument/Makefile.am	(original)
+++ trunk/libdocument/Makefile.am	Sun Jan 18 15:31:03 2009
@@ -2,14 +2,14 @@
 	-DEVINCE_UIDIR=\"$(pkgdatadir)\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 	-DEV_BACKENDSDIR=\"$(libdir)/evince/backends\"	\
-	$(LIB_CFLAGS)					\
+	$(LIBDOCUMENT_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 lib_LTLIBRARIES = libevbackend.la
 
 libevbackend_la_LDFLAGS = -export-dynamic
-libevbackend_la_LIBADD = $(LIB_LIBS)
+libevbackend_la_LIBADD = $(LIBDOCUMENT_LIBS)
 
 NOINST_H_FILES =				\
 	ev-backends-manager.h			\