Remove the GNOMECANVASPIXBUF depedency. Its not used no more.

2000-06-20  Ramiro Estrugo  <ramiro@eazel.com>

* configure.in:
* libnautilus-extensions/Makefile.am:
* libnautilus/Makefile.am:
* librsvg/Makefile.am:
* nautilus-installer/src/Makefile:
* src/Makefile.am:
* src/file-manager/Makefile.am:
* test/Makefile.am:

Remove the GNOMECANVASPIXBUF depedency.  Its not used no more.
This commit is contained in:
Ramiro Estrugo 2000-06-20 16:26:35 +00:00 committed by Ramiro Estrugo
parent 0d05aea1fc
commit a5e37b99c4
10 changed files with 23 additions and 36 deletions

View file

@ -1,3 +1,16 @@
2000-06-20 Ramiro Estrugo <ramiro@eazel.com>
* configure.in:
* libnautilus-extensions/Makefile.am:
* libnautilus/Makefile.am:
* librsvg/Makefile.am:
* nautilus-installer/src/Makefile:
* src/Makefile.am:
* src/file-manager/Makefile.am:
* test/Makefile.am:
Remove the GNOMECANVASPIXBUF depedency. Its not used no more.
Tue Jun 20 01:49:08 2000 George Lebl <jirka@5z.com>
* test/nautilus-leak-symbol-lookup.c

View file

@ -224,9 +224,7 @@ AC_MSG_ERROR([
*** is always available from ftp://ftp.gtk.org/.]))
AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is
required.]), gnomecanvaspixbuf bonobo vfs idl)
AC_SUBST(GNOMECANVASPIXBUF_LIBS)
AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR)
required.]), bonobo vfs idl)
AC_SUBST(GNORBA_CFLAGS)
AC_SUBST(GNORBA_LIBS)
AC_SUBST(BONOBO_CFLAGS)

View file

@ -10,7 +10,6 @@ INCLUDES = \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR) \
@ -19,15 +18,11 @@ INCLUDES = \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
$(NULL)
# $(top_builddir)/libnautilus/libnautilus.la
# $(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG) \

View file

@ -10,7 +10,6 @@ INCLUDES = \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GHTTP_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR) \
@ -19,15 +18,11 @@ INCLUDES = \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
$(NULL)
# $(top_builddir)/libnautilus/libnautilus.la
# $(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GHTTP_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG) \

View file

@ -6,7 +6,6 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I. \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR) \
@ -16,7 +15,6 @@ libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(LIBPNG)

View file

@ -3,7 +3,6 @@ NULL=
bin_PROGRAMS=test-rsvg
test_rsvg_LDADD =\
$(GNOMECANVASPIXBUF_LIBS) \
$(GNOMEUI_LIBS) \
librsvg.la
@ -11,7 +10,6 @@ lib_LTLIBRARIES=librsvg.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOME_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(GDK_PIXBUF_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR) \
@ -19,7 +17,6 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
librsvg_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(XML_LIBS) \
$(LIBPNG)

View file

@ -82,13 +82,8 @@ GHTTP_LIBS = -L/gnome/lib -lghttp
GLIB_CFLAGS = -I/gnome/lib/glib/include -I/gnome/include
GLIB_CONFIG = /gnome/bin/glib-config
GLIB_LIBS = -L/gnome/lib -lglib
GMOFILES = da.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo fr.gmo
GMOFILES = da.gmo de.gmo fr.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo
GMSGFMT = /usr/bin/msgfmt
GNET_CFLAGS = -I/gnome/lib/glib/include -I/gnome/include
GNET_CONFIG = /gnome/bin/gnet-config
GNET_LIBS = -L/gnome/lib -lgnet -lglib
GNOMECANVASPIXBUF_INCLUDEDIR =
GNOMECANVASPIXBUF_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -lgdk_pixbuf -ltiff -ljpeg -lpng -lz -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm -lgnomecanvaspixbuf
GNOMEUI_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include
GNOMEUI_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
GNOME_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include
@ -96,12 +91,13 @@ GNOME_CONFIG = /gnome/bin/gnome-config
GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
GNORBA_CFLAGS =
GNORBA_LIBS =
GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/usr/X11R6/include -I/gnome/include/gnome-xml
GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lgmodule -lglib -ldl -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz
GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -I/usr/X11R6/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/include/gnome-xml
GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -lgconf -lgconf-gtk -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
GTK_CFLAGS =
GTK_LIBS =
GT_NO =
GT_YES = #YES#
IDL_CFLAGS = -I/gnome/share/idl
INCLUDE_LOCALE_H = #include <locale.h>
INSTOBJEXT = .mo
INTLDEPS =
@ -117,9 +113,9 @@ LN_S = ln -s
MAINT =
MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
MOZILLA_COMPONENT_CFLAGS = -I/gnome-source/MOZILLA/mozilla/dist/include
MOZILLA_COMPONENT_LDFLAGS = -L/gnome-source/MOZILLA/mozilla/dist/bin
MOZILLA_COMPONENT_LIBS = -lgtkembedmoz -lgtksuperwin -lxpcom -lnspr4 -lplc4 -lplds4
MOZILLA_COMPONENT_CFLAGS = -I/usr/include/mozilla
MOZILLA_COMPONENT_LDFLAGS = -L/usr/lib/mozilla
MOZILLA_COMPONENT_LIBS = -lgtkembedmoz -lgtksuperwin -lxpcom -lnspr4 -lplc4 -lplds4
NM = /usr/bin/nm -B
OAF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include
OAF_CONFIG = /gnome/bin/oaf-config
@ -131,7 +127,7 @@ ORBIT_IDL = /gnome/bin/orbit-idl
ORBIT_LIBS = -L/gnome/lib -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
PACKAGE = nautilus
PAM_LIBS = -ldl -lpam -lpam_misc
POFILES = da.po gl.po ja.po ko.po no.po ru.po sv.po tr.po fr.po
POFILES = da.po de.po fr.po gl.po ja.po ko.po no.po ru.po sv.po tr.po
POSUB = po
RANLIB = ranlib
RPM_LIBS = -lrpm -lz -lbz2 -lpopt -ldb
@ -151,7 +147,7 @@ l =
NULL =
INCLUDES = -I$(top_srcdir)/components/services/install/lib -I$(top_srcdir)/components/services/trilobite -I/usr/include/rpm $(GNOMEUI_CFLAGS) $(XML_CFLAGS) $(GNET_CFLAGS) $(GHTTP_CFLAGS) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Installer\" $(NULL)
INCLUDES = -I$(top_srcdir)/components/services/install/lib -I$(top_srcdir)/components/services/trilobite -I/usr/include/rpm $(GNOMEUI_CFLAGS) $(XML_CFLAGS) $(GHTTP_CFLAGS) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Installer\" $(NULL)
CFLAGS = -g $(WERROR)

View file

@ -12,7 +12,6 @@ INCLUDES =\
$(OAF_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
@ -31,7 +30,6 @@ LDADD =\
$(OAF_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(NULL)

View file

@ -9,7 +9,6 @@ INCLUDES = \
$(OAF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(WERROR) \
-D_REENTRANT \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \

View file

@ -10,7 +10,6 @@ INCLUDES =\
$(OAF_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
@ -27,7 +26,6 @@ LDADD =\
$(OAF_LIBS) \
$(GCONF_LIBS) \
$(GNOMEUI_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
$(XML_LIBS) \
$(NULL)