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

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.

svn path=/trunk/; revision=3352

diff --git a/ChangeLog b/ChangeLog
index 530c485fd2569274514b2c607fe666256968d894..4c17c4e069bdf0a2b43a052bf2329bdab54ea69c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+       
 2009-01-18  Christian Persch  <chpe@gnome.org>
 
        * libview/ev-view.c: (ev_view_drag_data_get),
@@ -10,7 +19,7 @@
        * shell/ev-window.c: Update drag handling code to use the
        gtk_*_add_uri_targets and gtk_*_add_text_targets targets instead of
        hardcoding the targets lists. Bug #558084.
-
+       
 2009-01-18  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * libdocument/Makefile.am:

diff --git a/configure.ac b/configure.ac
index e8a7d1a789620c78581ddd2fe3ac7c75b2e7775b..940e13171fd49e73a357a76f22e935c33e5cb554 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ KEYRING_REQUIRED=2.22.0
 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 @@ if test "x$enable_debug" = "xyes"; then
 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"

diff --git a/cut-n-paste/evmountoperation/Makefile.am b/cut-n-paste/evmountoperation/Makefile.am
index a88885b47689c2785deb0af6c3d42b5927a9ca2c..e84c1b4c16bdce069793b4678b1fae0ee2edd7fe 100644 (file)
--- a/cut-n-paste/evmountoperation/Makefile.am
+++ b/cut-n-paste/evmountoperation/Makefile.am
@@ -5,7 +5,6 @@ libevmountoperation_la_SOURCES =        \
        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

diff --git a/cut-n-paste/gedit-message-area/Makefile.am b/cut-n-paste/gedit-message-area/Makefile.am
index 8e6368b089bcdcd6812a1692c9d1079a89dc7d6e..ce56f327cd495623ddb4bfae287dbab49a8f3859 100644 (file)
--- a/cut-n-paste/gedit-message-area/Makefile.am
+++ b/cut-n-paste/gedit-message-area/Makefile.am
@@ -4,7 +4,6 @@ libgeditmsgarea_la_SOURCES =    \
        gedit-message-area.h
 
 libgeditmsgarea_la_CFLAGS =    \
-       -I$(top_srcdir)/lib     \
-       $(LIB_CFLAGS)           \
+       $(SHELL_CORE_CFLAGS)    \
        $(WARNING_CFLAGS)       \
        $(DISABLE_DEPRECATED)

diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
index d98684764304ea2d9c9020ff55af688f1858cb53..8bc909dd1b04ada19b5fb30d0f9b30f0bf8ab999 100644 (file)
--- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am
+++ b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
@@ -5,8 +5,7 @@ libgimpcellrenderertoggle_la_sources =  \
        gimpcellrenderertoggle.c
 
 libgimpcellrenderertoggle_la_CFLAGS =  \
-       -I$(top_srcdir)/lib             \
-       $(LIB_CFLAGS)                   \
+       $(SHELL_CORE_CFLAGS)            \
        $(WARNING_CFLAGS)               \
        $(DISABLE_DEPRECATED)
 

diff --git a/cut-n-paste/smclient/Makefile.am b/cut-n-paste/smclient/Makefile.am
index 3cb77255c0fc4d9faae41f616b1cab427239af68..25e9840affaba5534239ad46b0d7b8ecbd2f3602 100644 (file)
--- a/cut-n-paste/smclient/Makefile.am
+++ b/cut-n-paste/smclient/Makefile.am
@@ -9,7 +9,6 @@ libsmclient_la_SOURCES =        \
        eggsmclient-xsmp.c
 
 libsmclient_la_CFLAGS =                                \
-       -I$(top_srcdir)/lib                     \
        -DG_LOG_DOMAIN=\""EggSMClient"\"        \       
        -DEGG_SM_CLIENT_BACKEND_XSMP            \
        $(SMCLIENT_CFLAGS)                      \

diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 28b1380e4152fc8f4b9e460356d23e728d159f3e..a01c155a3e8b251f20ee5e5c83f032b109557862 100644 (file)
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -20,11 +20,10 @@ libtoolbareditor_la_SOURCES =       \
        $(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)\"          \

diff --git a/cut-n-paste/totem-screensaver/Makefile.am b/cut-n-paste/totem-screensaver/Makefile.am
index 9108b9111ad1547a915850c8c937e6a907d054cc..ab67e2c5f6a3ab5f53ae5eb0624b28102f91f79a 100644 (file)
--- a/cut-n-paste/totem-screensaver/Makefile.am
+++ b/cut-n-paste/totem-screensaver/Makefile.am
@@ -3,9 +3,8 @@ libtotemscrsaver_la_SOURCES = \
        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)

diff --git a/cut-n-paste/zoom-control/Makefile.am b/cut-n-paste/zoom-control/Makefile.am
index 8b382f9ca2c130247946cf835a9cba6eff5cc20f..64cdc9d6a0230284bdfb200c49866849b7d92d25 100644 (file)
--- a/cut-n-paste/zoom-control/Makefile.am
+++ b/cut-n-paste/zoom-control/Makefile.am
@@ -9,7 +9,6 @@ libephyzoom_la_SOURCES = \
        ephy-zoom.h
 
 libephyzoom_la_CFLAGS = \
-       -I$(top_srcdir)/lib     \
-       $(LIB_CFLAGS)           \
+       $(SHELL_CORE_CFLAGS)    \
        $(WARNING_CFLAGS)       \
        $(DISABLE_DEPRECATED)

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index e91897c55f9e626f5209d5844517415041bc8630..4ce98465c723f91646e05ce246e91902be64a662 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -2,14 +2,14 @@ INCLUDES=                                             \
        -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                   \