diff -crN ./nautilus/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/Makefile.in *** ./nautilus/Makefile.in Mon Sep 8 22:02:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/Makefile.in Fri Dec 19 01:17:26 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = DESKTOP_IN_FILES = \ *************** *** 228,246 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = nautilus.spec DIST_SOURCES = DATA = $(Applications_DATA) $(Settings_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = README AUTHORS COPYING COPYING.LIB ChangeLog INSTALL \ ! Makefile.am Makefile.in NEWS THANKS TODO acconfig.h aclocal.m4 \ ! config.guess config.h.in config.sub configure configure.in \ ! depcomp install-sh ltmain.sh missing mkinstalldirs \ ! nautilus.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive --- 283,304 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = nautilus.spec + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(Applications_DATA) $(Settings_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = README $(top_srcdir)/Makefile.shared AUTHORS COPYING \ ! COPYING.LIB ChangeLog INSTALL Makefile.am Makefile.in NEWS \ ! THANKS TODO acconfig.h aclocal.m4 config.guess config.h.in \ ! config.sub configure configure.in depcomp install-sh ltmain.sh \ ! missing mkinstalldirs nautilus.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive *************** *** 251,257 **** configure.lineno $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) --- 309,315 ---- configure.lineno $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) *************** *** 382,391 **** --- 440,456 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 416,428 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . --- 481,508 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . *************** *** 434,446 **** && rm -fr $(distdir); }; } GZIP_ENV = --best distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/libnautilus $(distdir)/po ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 514,533 ---- && rm -fr $(distdir); }; } GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/libnautilus $(distdir)/po ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 474,480 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ --- 561,567 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ *************** *** 500,507 **** mkdir $(distdir)/=inst chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ --- 587,595 ---- mkdir $(distdir)/=inst chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ *************** *** 509,531 **** && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! find $$dc_install_base -type f -print ; \ ! exit 1; } >&2 ) \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am --- 597,635 ---- && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am *************** *** 595,610 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-ApplicationsDATA uninstall-SettingsDATA \ uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive dist dist-all \ ! dist-gzip distcheck distclean distclean-generic distclean-hdr \ ! distclean-libtool distclean-recursive distclean-tags \ ! distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ info-recursive install install-ApplicationsDATA \ install-SettingsDATA install-am install-data install-data-am \ install-data-recursive install-exec install-exec-am \ --- 699,723 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-ApplicationsDATA uninstall-SettingsDATA \ uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-recursive distclean-tags distcleancheck distdir \ ! distuninstallcheck dvi dvi-am dvi-recursive info info-am \ info-recursive install install-ApplicationsDATA \ install-SettingsDATA install-am install-data install-data-am \ install-data-recursive install-exec install-exec-am \ *************** *** 614,620 **** installdirs-am installdirs-recursive maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-ApplicationsDATA \ uninstall-SettingsDATA uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive --- 727,734 ---- installdirs-am installdirs-recursive maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-ApplicationsDATA \ uninstall-SettingsDATA uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive diff -crN ./nautilus/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/aclocal.m4 *** ./nautilus/aclocal.m4 Mon Sep 8 22:02:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/aclocal.m4 Fri Dec 19 01:16:13 2003 *************** *** 1,6 **** ! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.7.1 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 43,49 **** # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! AC_PREREQ([2.52]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. --- 43,49 ---- # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! AC_PREREQ([2.54]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. *************** *** 69,74 **** --- 69,84 ---- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + AC_SUBST([CYGPATH_W]) + # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], *************** *** 100,116 **** AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, ! [AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], ! [define([AC_PROG_][CC], ! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl ! AC_PROVIDE_IFELSE([AC_PROG_][CXX], [_AM_DEPENDENCIES(CXX)], ! [define([AC_PROG_][CXX], ! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 110,138 ---- AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, ! [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], ! [define([AC_PROG_CC], ! defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ! AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], ! [define([AC_PROG_CXX], ! defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header + # that is generated. The stamp files are numbered to have different names. + + # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the + # loop where config.status creates the headers, so we can generate + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [_am_stamp_count=`expr ${_am_stamp_count-0} + 1` + echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 131,144 **** # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- --- 153,166 ---- # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.7.1])]) # Helper functions for option handling. -*- Autoconf -*- *************** *** 518,524 **** if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type=$depmode --- 540,546 ---- if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type=$depmode *************** *** 533,538 **** --- 555,563 ---- fi ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) + AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) *************** *** 652,658 **** [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) ! # Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 677,685 ---- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) ! # Check to see how 'make' treats includes. -*- Autoconf -*- ! ! # Copyright (C) 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 692,698 **** # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU --- 719,725 ---- # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU *************** *** 752,758 **** fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional \"$1\" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) --- 779,785 ---- fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional "$1" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) *************** *** 779,843 **** # serial 6 ! # When config.status generates a header, we must update the stamp-h file. ! # This file resides in the same directory as the config header ! # that is generated. We must strip everything past the first ":", ! # and everything past the last "/". ! ! # _AM_DIRNAME(PATH) ! # ----------------- ! # Like AS_DIRNAME, only do it during macro expansion ! AC_DEFUN([_AM_DIRNAME], ! [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, ! m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, ! m4_if(regexp([$1], [^/.*]), -1, ! [.], ! patsubst([$1], [^\(/\).*], [\1])), ! patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), ! patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl ! ])# _AM_DIRNAME ! ! ! # The stamp files are numbered to have different names. ! # We could number them on a directory basis, but that's additional ! # complications, let's have a unique counter. ! m4_define([_AM_STAMP_Count], [0]) ! ! ! # _AM_STAMP(HEADER) ! # ----------------- ! # The name of the stamp file for HEADER. ! AC_DEFUN([_AM_STAMP], ! [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl ! AS_ESCAPE(_AM_DIRNAME(patsubst([$1], ! [:.*])))/stamp-h[]_AM_STAMP_Count]) ! ! ! # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) ! # ------------------------------------------------------------ ! # We used to try to get a real timestamp in stamp-h. But the fear is that ! # that will cause unnecessary cvs conflicts. ! AC_DEFUN([_AM_CONFIG_HEADER], ! [# Add the stamp file to the list of files AC keeps track of, ! # along with our hook. ! AC_CONFIG_HEADERS([$1], ! [# update the timestamp ! echo 'timestamp for $1' >"_AM_STAMP([$1])" ! $2], ! [$3]) ! ])# _AM_CONFIG_HEADER ! ! ! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) ! # -------------------------------------------------------------- ! AC_DEFUN([AM_CONFIG_HEADER], ! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) ! ])# AM_CONFIG_HEADER # Add --enable-maintainer-mode option to configure. # From Jim Meyering ! # Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 806,818 ---- # serial 6 ! # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering ! # Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 854,860 **** # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. ! # serial 1 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) --- 829,835 ---- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. ! # serial 2 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) *************** *** 871,886 **** ] ) ! # isc-posix.m4 serial 2 (gettext-0.11.2) ! dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ! dnl This file is free software, distributed under the terms of the GNU ! dnl General Public License. As a special exception to the GNU General ! dnl Public License, this file may be distributed as part of a program ! dnl that contains a configuration script generated by Autoconf, under ! dnl the same distribution terms as the rest of that program. ! ! # This file is not needed with autoconf-2.53 and newer. Remove it in 2005. # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) --- 846,854 ---- ] ) ! AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + #serial 1 # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) *************** *** 927,934 **** AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl - AC_REQUIRE([LT_AC_PROG_SED])dnl - AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl --- 895,900 ---- *************** *** 1096,1107 **** lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; - osf*) - symcode='[[BCDEGQRST]]' - ;; solaris* | sysv5*) symcode='[[BDT]]' ;; --- 1062,1070 ---- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix*) symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) symcode='[[BDT]]' ;; *************** *** 1198,1204 **** save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 1161,1167 ---- save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" *************** *** 1742,1748 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 1705,1711 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 1785,1791 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 1748,1754 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 1829,1835 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 1792,1802 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' ! else ! lt_cv_prog_cc_wl='-Wl,' ! fi ;; uts4*) *************** *** 2051,2056 **** --- 2018,2024 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 2194,2200 **** # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 2162,2168 ---- # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; *************** *** 2203,2209 **** set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 2171,2176 ---- *************** *** 2308,2332 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # Test if we are trying to use run time linking or normal ! # AIX style linking. If -brtl is somewhere in LDFLAGS, we ! # need to do runtime linking. ! case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 2275,2287 ---- aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" + use_runtimelinking="" else ! aix_use_runtimelinking=yes ! export_dynamic_flag_spec='-bexpall' exp_sym_flag='-bexport' no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' fi # When large executables or shared objects are built, AIX ld can *************** *** 2361,2375 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 2316,2322 ---- shared_flag='-shared' else # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to *************** *** 2379,2386 **** # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 2326,2333 ---- # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' *************** *** 2393,2399 **** allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 2340,2346 ---- allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 2435,2443 **** esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 2382,2389 ---- esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes *************** *** 2489,2502 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 2435,2447 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 2524,2530 **** hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 2469,2475 ---- hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else *************** *** 2534,2540 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 2479,2485 ---- hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac *************** *** 2646,2668 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 2591,2603 ---- ;; sysv4) ! if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! else ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 2803,2811 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 2738,2743 ---- *************** *** 2827,2850 **** fi ;; esac ! # AIX (on Power*) has no versioning support, so currently we can ! # not hardcode correct soname into executable. Probably we can ! # add versioning support to collect2, so additional links can ! # be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so ! # instead of lib.a to let people know that these are not ! # typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH fi - hardcode_into_libs=yes ;; amigaos*) --- 2759,2770 ---- fi ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH + hardcode_into_libs=yes fi ;; amigaos*) *************** *** 2892,2898 **** ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' --- 2812,2818 ---- ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' *************** *** 2975,2991 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 2895,2908 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 3030,3055 **** # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - - # Find out which ABI we are using (multilib Linux x86_64 hack). - libsuff= - case "$host_cpu" in - x86_64*|s390x*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - ;; - esac - fi - rm -rf conftest* - ;; - *) - ;; - esac - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) --- 2947,2952 ---- *************** *** 3109,3120 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 3006,3016 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 3157,3168 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 3053,3058 ---- *************** *** 3224,3230 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 3114,3120 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 3317,3326 **** # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ --- 3207,3217 ---- # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ + use_runtimelinking \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ *************** *** 3379,3389 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # A sed that does not truncate output. - SED=$lt_SED - # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. --- 3270,3277 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="sed -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. *************** *** 3505,3510 **** --- 3393,3401 ---- # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + # Compiler flag to allow runtime linking + use_runtimelinking=$lt_use_runtimelinking + # Compiler flag to generate shared objects directly from archives. whole_archive_flag_spec=$lt_whole_archive_flag_spec *************** *** 4144,4150 **** # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= --- 4035,4041 ---- # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependant libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= *************** *** 4219,4227 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 4110,4118 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 4243,4249 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4134,4140 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM *************** *** 4314,4322 **** lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4205,4210 ---- *************** *** 4345,4351 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 4233,4255 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 4382,4393 **** ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4286,4297 ---- ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and INCLTDL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and INCLTDL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 4399,4416 **** ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ! # For backwards non-gettext consistent compatibility... ! INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4303,4318 ---- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 4428,4441 **** if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! LTDLINCL= fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" ]) # old names --- 4330,4341 ---- if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! INCLTDL= fi ]) # old names *************** *** 4450,4544 **** # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) - # NOTE: This macro has been submitted for inclusion into # - # GNU Autoconf as AC_PROG_SED. When it is available in # - # a released version of Autoconf we should remove this # - # macro and use it instead. # - # LT_AC_PROG_SED - # -------------- - # Check for a fully-functional sed program, that truncates - # as few characters as possible. Prefer GNU sed if found. - AC_DEFUN([LT_AC_PROG_SED], - [AC_MSG_CHECKING([for a sed that does not truncate output]) - AC_CACHE_VAL(lt_cv_path_SED, - [# Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. - as_executable_p="test -f" - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi - done - done - done - - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - - # Create a (secure) tmp directory for tmp files. - : ${TMPDIR=/tmp} - { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } - } - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" - ]) - if test "X$SED" != "X"; then - lt_cv_path_SED=$SED - else - SED=$lt_cv_path_SED - fi - AC_MSG_RESULT([$SED]) - ]) - dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page --- 4350,4355 ---- *************** *** 4783,4788 **** --- 4594,4601 ---- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" AC_CHECK_FUNCS(dcgettext) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, *************** *** 4809,4814 **** --- 4622,4628 ---- DATADIRNAME=lib ;; esac]) + LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else gt_cv_have_gettext=no *************** *** 4976,4981 **** --- 4790,4796 ---- ])dnl + dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) # serial 1 AC_PROG_INTLTOOL AC_DEFUN(AC_PROG_INTLTOOL, *************** *** 5054,5060 **** AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() --- 4869,4875 ---- AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() *************** *** 5063,5069 **** AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) --- 4878,4884 ---- AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) diff -crN ./nautilus/components/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/Makefile.in *** ./nautilus/components/Makefile.in Mon Sep 8 22:02:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/Makefile.in Fri Dec 19 01:17:27 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = \ *************** *** 184,195 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 239,253 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 197,203 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 255,261 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 265,274 **** --- 323,339 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 299,318 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 364,404 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 410,432 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive --- 496,528 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive diff -crN ./nautilus/components/adapter/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/adapter/Makefile.in *** ./nautilus/components/adapter/Makefile.in Mon Sep 8 22:02:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/adapter/Makefile.in Fri Dec 19 01:17:28 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 241,263 **** $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la nautilus_adapter_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-control-embed-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-control-factory-embed-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-embed-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-factory-server.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-file-load-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-load-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-stream-load-strategy.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-zoomable-proxy.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 296,304 ---- $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la nautilus_adapter_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 265,271 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(nautilus_adapter_SOURCES) DATA = $(server_DATA) --- 306,311 ---- *************** *** 278,284 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/adapter/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 318,324 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/adapter/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 292,298 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done --- 332,338 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \ else :; fi; \ done *************** *** 320,357 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-control-embed-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-control-factory-embed-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-embed-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-factory-server.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-file-load-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-load-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-stream-load-strategy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-zoomable-proxy.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 360,373 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 384,389 **** --- 400,408 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 409,428 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 428,468 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 481,488 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 521,528 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 511,530 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libexecPROGRAMS clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libexecPROGRAMS install-man install-serverDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-serverDATA --- 551,578 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libexecPROGRAMS clean-libtool ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libexecPROGRAMS install-man install-serverDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-serverDATA diff -crN ./nautilus/components/emblem/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/emblem/Makefile.in *** ./nautilus/components/emblem/Makefile.in Mon Sep 8 22:02:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/emblem/Makefile.in Fri Dec 19 01:17:29 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 221,235 **** libnautilus_emblem_view_la_OBJECTS = \ $(am_libnautilus_emblem_view_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmain.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-emblem-view.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 276,284 ---- libnautilus_emblem_view_la_OBJECTS = \ $(am_libnautilus_emblem_view_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 237,243 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_emblem_view_la_SOURCES) DATA = $(server_DATA) --- 286,291 ---- *************** *** 250,256 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/emblem/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) --- 298,304 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/emblem/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 277,283 **** -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 325,331 ---- -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 290,319 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-emblem-view.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 338,351 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 346,351 **** --- 378,386 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 371,390 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 406,446 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 442,449 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 498,505 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 472,492 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-bonoboLTLIBRARIES \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-bonoboLTLIBRARIES uninstall-info-am \ ! uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) --- 528,556 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean \ ! clean-bonoboLTLIBRARIES clean-generic clean-libtool ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-bonoboLTLIBRARIES \ ! uninstall-info-am uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) diff -crN ./nautilus/components/hardware/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Makefile.in *** ./nautilus/components/hardware/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Makefile.in Fri Dec 19 01:17:29 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = icons *************** *** 176,181 **** --- 231,237 ---- -I$(top_srcdir) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(COMPONENT_CFLAGS) \ + $(LIBGTOP_CFLAGS) \ $(NULL) *************** *** 196,201 **** --- 252,258 ---- $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ $(COMPONENT_LIBS) \ + $(LIBGTOP_LIBS) \ $(NULL) *************** *** 219,233 **** $(top_builddir)/libnautilus-private/libnautilus-private.la nautilus_hardware_view_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-hardware-view.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 276,284 ---- $(top_builddir)/libnautilus-private/libnautilus-private.la nautilus_hardware_view_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 235,249 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(nautilus_hardware_view_SOURCES) DATA = $(server_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_hardware_view_SOURCES) --- 286,300 ---- CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(nautilus_hardware_view_SOURCES) DATA = $(server_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_hardware_view_SOURCES) *************** *** 254,260 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/hardware/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 305,311 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/hardware/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 268,274 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done --- 319,325 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \ else :; fi; \ done *************** *** 296,325 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-hardware-view.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 347,360 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 403,412 **** --- 438,454 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 437,456 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 479,519 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 522,529 **** distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-recursive --- 585,592 ---- distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive *************** *** 552,577 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-libexecPROGRAMS clean-libtool \ ! clean-recursive distclean distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-libexecPROGRAMS install-man \ ! install-recursive install-serverDATA install-strip installcheck \ ! installcheck-am installdirs installdirs-am \ ! installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-libexecPROGRAMS \ uninstall-recursive uninstall-serverDATA --- 615,650 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ clean-generic clean-libexecPROGRAMS clean-libtool \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive \ ! install-libexecPROGRAMS install-man install-recursive \ ! install-serverDATA install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-libexecPROGRAMS \ uninstall-recursive uninstall-serverDATA diff -crN ./nautilus/components/hardware/icons/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/icons/Makefile.in *** ./nautilus/components/hardware/icons/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/icons/Makefile.in Fri Dec 19 01:17:30 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ icondir = $(datadir)/pixmaps/nautilus icon_DATA = \ *************** *** 180,185 **** --- 235,242 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(icon_DATA) *************** *** 189,195 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/hardware/icons/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 246,252 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/hardware/icons/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 223,235 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 280,301 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 314,319 **** --- 380,393 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-iconDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 323,330 **** install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-iconDATA \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 397,404 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-iconDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/components/history/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/Makefile.in *** ./nautilus/components/history/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/Makefile.in Fri Dec 19 01:17:31 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 215,229 **** libnautilus_history_view_la_OBJECTS = \ $(am_libnautilus_history_view_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmain.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-history-view.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 270,278 ---- libnautilus_history_view_la_OBJECTS = \ $(am_libnautilus_history_view_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 231,237 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_history_view_la_SOURCES) DATA = $(server_DATA) --- 280,285 ---- *************** *** 244,250 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/history/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) --- 292,298 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/history/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 271,277 **** -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 319,325 ---- -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 284,313 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-history-view.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 332,345 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 340,345 **** --- 372,380 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 365,384 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 400,440 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 437,444 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 493,500 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 467,487 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-bonoboLTLIBRARIES \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-bonoboLTLIBRARIES uninstall-info-am \ ! uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) --- 523,551 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean \ ! clean-bonoboLTLIBRARIES clean-generic clean-libtool ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-bonoboLTLIBRARIES \ ! uninstall-info-am uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) diff -crN ./nautilus/components/image_properties/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/Makefile.in *** ./nautilus/components/image_properties/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/Makefile.in Fri Dec 19 01:17:32 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 17,101 **** # WHAT YOU NEED TO CHANGE: Change all the filenames to refer to your # component. Also add whatever libraries, include paths, etc you want, # and change the G_LOG_DOMAIN. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 17,96 ---- # WHAT YOU NEED TO CHANGE: Change all the filenames to refer to your # component. Also add whatever libraries, include paths, etc you want, # and change the G_LOG_DOMAIN. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 110,116 **** --- 105,118 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 134,154 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 136,175 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 157,175 **** --- 178,230 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ INCLUDES = \ -DG_DISABLE_DEPRECATED \ *************** *** 219,233 **** libnautilus_image_properties_view_la_OBJECTS = \ $(am_libnautilus_image_properties_view_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmain.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-image-properties-view.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 274,282 ---- libnautilus_image_properties_view_la_OBJECTS = \ $(am_libnautilus_image_properties_view_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 235,241 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_image_properties_view_la_SOURCES) DATA = $(server_DATA) --- 284,289 ---- *************** *** 248,254 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/image_properties/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) --- 296,302 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/image_properties/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 275,281 **** -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 323,329 ---- -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 288,317 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-image-properties-view.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 336,349 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 344,349 **** --- 376,384 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 369,388 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 404,444 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 441,448 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 497,504 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 471,491 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-bonoboLTLIBRARIES \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-bonoboLTLIBRARIES uninstall-info-am \ ! uninstall-serverDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@ --- 527,555 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean \ ! clean-bonoboLTLIBRARIES clean-generic clean-libtool ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-bonoboLTLIBRARIES \ ! uninstall-info-am uninstall-serverDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@ diff -crN ./nautilus/components/notes/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/Makefile.in *** ./nautilus/components/notes/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/Makefile.in Fri Dec 19 01:17:33 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 211,224 **** libnautilus_notes_view_la_OBJECTS = \ $(am_libnautilus_notes_view_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-notes.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 266,274 ---- libnautilus_notes_view_la_OBJECTS = \ $(am_libnautilus_notes_view_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 226,232 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_notes_view_la_SOURCES) DATA = $(server_DATA) --- 276,281 ---- *************** *** 239,245 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/notes/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) --- 288,294 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/notes/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 266,272 **** -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 315,321 ---- -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 279,307 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-notes.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 328,341 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 334,339 **** --- 368,376 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 359,378 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 396,436 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 431,438 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 489,496 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 461,481 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-bonoboLTLIBRARIES \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-bonoboLTLIBRARIES uninstall-info-am \ ! uninstall-serverDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@ --- 519,547 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean \ ! clean-bonoboLTLIBRARIES clean-generic clean-libtool ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-bonoboLTLIBRARIES \ ! uninstall-info-am uninstall-serverDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@ diff -crN ./nautilus/components/text/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/text/Makefile.in *** ./nautilus/components/text/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/text/Makefile.in Fri Dec 19 01:17:34 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = services *************** *** 215,228 **** nautilus_text_view_DEPENDENCIES = ../../libnautilus/libnautilus.la nautilus_text_view_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-text-view.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 270,278 ---- nautilus_text_view_DEPENDENCIES = ../../libnautilus/libnautilus.la nautilus_text_view_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 230,244 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(nautilus_text_view_SOURCES) DATA = $(server_DATA) $(ui_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_text_view_SOURCES) --- 280,294 ---- CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(nautilus_text_view_SOURCES) DATA = $(server_DATA) $(ui_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_text_view_SOURCES) *************** *** 249,255 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/text/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 299,305 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/text/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 263,269 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done --- 313,319 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \ else :; fi; \ done *************** *** 291,319 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-text-view.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 341,354 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 415,424 **** --- 450,466 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 449,468 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 491,531 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 534,541 **** distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-recursive --- 597,604 ---- distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive *************** *** 564,592 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA uninstall-uiDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-libexecPROGRAMS clean-libtool \ ! clean-recursive distclean distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-libexecPROGRAMS install-man \ ! install-recursive install-serverDATA install-strip \ ! install-uiDATA installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! mostlyclean-recursive tags tags-recursive uninstall \ ! uninstall-am uninstall-info-am uninstall-info-recursive \ ! uninstall-libexecPROGRAMS uninstall-recursive \ ! uninstall-serverDATA uninstall-uiDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ --- 627,664 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA uninstall-uiDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ clean-generic clean-libexecPROGRAMS clean-libtool \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive \ ! install-libexecPROGRAMS install-man install-recursive \ ! install-serverDATA install-strip install-uiDATA installcheck \ ! installcheck-am installdirs installdirs-am \ ! installdirs-recursive maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-libexecPROGRAMS \ ! uninstall-recursive uninstall-serverDATA uninstall-uiDATA $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ diff -crN ./nautilus/components/text/services/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/text/services/Makefile.in *** ./nautilus/components/text/services/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/text/services/Makefile.in Fri Dec 19 01:17:34 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = servicesdir = $(datadir)/nautilus/services/text *************** *** 181,186 **** --- 236,243 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(services_DATA) *************** *** 190,196 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/text/services/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 247,253 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/text/services/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 224,236 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 281,302 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 315,320 **** --- 381,394 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-servicesDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 324,331 **** install-info-am install-man install-servicesDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-servicesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 398,405 ---- install-info-am install-man install-servicesDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-servicesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/components/throbber/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/throbber/Makefile.in *** ./nautilus/components/throbber/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/throbber/Makefile.in Fri Dec 19 01:17:35 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 214,228 **** $(top_builddir)/libnautilus-private/libnautilus-private.la nautilus_throbber_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-throbber.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 269,277 ---- $(top_builddir)/libnautilus-private/libnautilus-private.la nautilus_throbber_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 230,236 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(nautilus_throbber_SOURCES) DATA = $(server_DATA) --- 279,284 ---- *************** *** 243,249 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/throbber/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 291,297 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/throbber/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 257,263 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done --- 305,311 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \ else :; fi; \ done *************** *** 285,314 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-throbber.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 333,346 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 341,346 **** --- 373,381 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 366,385 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 401,441 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 438,445 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 494,501 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 468,487 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libexecPROGRAMS clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libexecPROGRAMS install-man install-serverDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-serverDATA $(NULL) --- 524,551 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libexecPROGRAMS clean-libtool ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libexecPROGRAMS install-man install-serverDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-serverDATA $(NULL) diff -crN ./nautilus/components/tree/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/tree/Makefile.in *** ./nautilus/components/tree/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/tree/Makefile.in Fri Dec 19 01:17:36 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 222,237 **** libnautilus_tree_view_la_OBJECTS = \ $(am_libnautilus_tree_view_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libmain.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-tree-model.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-tree-view.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 277,285 ---- libnautilus_tree_view_la_OBJECTS = \ $(am_libnautilus_tree_view_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 239,245 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_tree_view_la_SOURCES) DATA = $(server_DATA) --- 287,292 ---- *************** *** 252,258 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu components/tree/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) --- 299,305 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps components/tree/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) bonoboLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 279,285 **** -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 326,332 ---- -test -z "$(bonobo_LTLIBRARIES)" || rm -f $(bonobo_LTLIBRARIES) @list='$(bonobo_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 292,322 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-tree-model.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-tree-view.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 339,352 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 349,354 **** --- 379,387 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 374,393 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 407,447 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 446,453 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 500,507 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 476,496 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: GTAGS all all-am check check-am clean clean-bonoboLTLIBRARIES \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-bonoboLTLIBRARIES uninstall-info-am \ ! uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) --- 530,558 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-bonoboLTLIBRARIES uninstall-info-am \ uninstall-serverDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean \ ! clean-bonoboLTLIBRARIES clean-generic clean-libtool ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-bonoboLTLIBRARIES install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-serverDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-bonoboLTLIBRARIES \ ! uninstall-info-am uninstall-serverDATA $(NULL) $(server_in_files:.server.in.in=.server.in): $(server_in_files) diff -crN ./nautilus/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.guess *** ./nautilus/config.guess Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.guess Fri Dec 19 01:16:13 2003 *************** *** 1,9 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-01-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 1,9 ---- #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 24,32 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner . ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 24,31 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Written by Per Bothner . ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 88,128 **** exit 1 fi - trap 'exit 1' 1 2 15 ! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a ! # compiler to aid in system detection is discouraged as it requires ! # temporary files to be created and, as you can see below, it is a ! # headache to deal with in a portable fashion. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! # Portable tmp directory creation inspired by the Autoconf team. ! ! set_cc_for_build=' ! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ! : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ! dummy=$tmp/dummy ; ! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ! case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int x;" > $dummy.c ; ! for c in cc gcc c89 c99 ; do ! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) --- 87,116 ---- exit 1 fi ! dummy=dummy-$$ ! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c ; ! for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; ! if test $? = 0 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) *************** *** 139,168 **** case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # ! # Note: NetBSD doesn't particularly care about the vendor ! # portion of the name. We always set it to "unknown". ! sysctl="sysctl -n hw.machine_arch" ! UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ! /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ! case "${UNAME_MACHINE_ARCH}" in ! armeb) machine=armeb-unknown ;; ! arm*) machine=arm-unknown ;; ! sh3el) machine=shl-unknown ;; ! sh3eb) machine=sh-unknown ;; ! *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE_ARCH}" in ! arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null --- 127,155 ---- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # Determine the machine/vendor (is the vendor relevant). ! case "${UNAME_MACHINE}" in ! amiga) machine=m68k-unknown ;; ! arm32) machine=arm-unknown ;; ! atari*) machine=m68k-atari ;; ! sun3*) machine=m68k-sun ;; ! mac68k) machine=m68k-apple ;; ! macppc) machine=powerpc-apple ;; ! hp3[0-9][05]) machine=m68k-hp ;; ! ibmrt|romp-ibm) machine=romp-ibm ;; ! *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE}" in ! i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null *************** *** 179,243 **** ;; esac # The OS release ! # Debian GNU/NetBSD machines have a different userland, and ! # thus, need a distinct triplet. However, they do not need ! # kernel version information, so it can be replaced with a ! # suitable tag, in the style of linux-gnu. ! case "${UNAME_VERSION}" in ! Debian*) ! release='-gnu' ! ;; ! *) ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! ;; ! esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:MicroBSD:*:*) - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 166,177 ---- ;; esac # The OS release ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` *************** *** 246,252 **** # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build cat <$dummy.s .data \$Lformat: --- 180,185 ---- *************** *** 272,280 **** jsr \$26,exit .end main EOF ! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null if test "$?" = 0 ; then ! case `$dummy` in 0-0) UNAME_MACHINE="alpha" ;; --- 205,214 ---- jsr \$26,exit .end main EOF ! eval $set_cc_for_build ! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! case `./$dummy` in 0-0) UNAME_MACHINE="alpha" ;; *************** *** 296,306 **** 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 230,238 ---- 2-1307) UNAME_MACHINE="alphaev68" ;; esac fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 315,325 **** Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! *:[Mm]orph[Oo][Ss]:*:*) ! echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition --- 247,275 ---- Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! arc64:OpenBSD:*:*) ! echo mips64el-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! hkmips:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! pmax:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! sgi:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! wgrisc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition *************** *** 341,350 **** NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 291,296 ---- *************** *** 373,379 **** echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) --- 319,325 ---- echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) *************** *** 387,392 **** --- 333,344 ---- aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor *************** *** 413,418 **** --- 365,382 ---- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; *************** *** 451,470 **** exit (-1); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c \ ! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; --- 415,429 ---- exit (-1); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy \ ! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; *************** *** 537,543 **** exit(0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 --- 496,503 ---- exit(0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 *************** *** 546,552 **** fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else --- 506,512 ---- fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else *************** *** 586,593 **** 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 --- 546,555 ---- 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! case "${HPUX_REV}" in ! 11.[0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 *************** *** 596,608 **** case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac ! fi ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include --- 558,570 ---- case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; esac ;; esac ! fi ;; ! esac ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include *************** *** 635,655 **** exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! test -z "$HP_ARCH" && HP_ARCH=hppa ! fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) --- 597,607 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy ! fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) *************** *** 683,689 **** exit (0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) --- 635,642 ---- exit (0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) *************** *** 711,716 **** --- 664,672 ---- parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; *************** *** 729,734 **** --- 685,693 ---- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *************** *** 741,761 **** CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; ! *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ! exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; --- 700,726 ---- CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY*T3D:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; ! CRAY-2:*:*:*) ! echo cray2-cray-unicos ! exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; *************** *** 766,783 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin --- 731,740 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ! exit 0 ;; ! *:OpenBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin *************** *** 788,804 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin --- 745,755 ---- i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin *************** *** 819,866 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu --- 770,785 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in ! big) echo mips-unknown-linux-gnu && exit 0 ;; ! little) echo mipsel-unknown-linux-gnu && exit 0 ;; ! esac ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu *************** *** 909,916 **** # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! # Set LC_ALL=C to ensure ld outputs messages in English. ! ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// --- 828,834 ---- # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! ld_supported_targets=`cd /; ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// *************** *** 922,928 **** ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; --- 840,846 ---- ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; *************** *** 934,961 **** esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! LIBC=gnu ! # else ! LIBC=gnulibc1 ! # endif ! # else ! LIBC=gnulibc1 ! # endif ! #else ! #ifdef __INTEL_COMPILER ! LIBC=gnu ! #else ! LIBC=gnuaout ! #endif ! #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) --- 852,883 ---- esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! cat >$dummy.c < ! #ifdef __cplusplus ! #include /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! printf ("%s-pc-linux-gnu\n", argv[1]); ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! #else ! printf ("%s-pc-linux-gnuaout\n", argv[1]); ! #endif ! return 0; ! } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) *************** *** 972,994 **** # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then --- 894,899 ---- *************** *** 1010,1028 **** UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about --- 915,936 ---- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about *************** *** 1046,1060 **** # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` --- 954,962 ---- # "miniframe" echo m68010-convergent-sysv exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` *************** *** 1071,1076 **** --- 973,981 ---- mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; *************** *** 1142,1150 **** SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; --- 1047,1052 ---- *************** *** 1152,1175 **** echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) ! case `uname -p` in ! *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; ! esac ! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! UNAME_PROCESSOR=`uname -p` ! if test "$UNAME_PROCESSOR" = "x86"; then ! UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi ! echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) --- 1054,1071 ---- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) ! echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi ! echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) *************** *** 1192,1197 **** --- 1088,1098 ---- fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; *************** *** 1210,1215 **** --- 1111,1122 ---- *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 *************** *** 1330,1336 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. --- 1237,1244 ---- } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy # Apollos put the system type in the environment. diff -crN ./nautilus/config.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.h.in *** ./nautilus/config.h.in Mon Sep 8 22:02:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.h.in Fri Dec 19 01:16:49 2003 *************** *** 27,32 **** --- 27,38 ---- /* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS + /* Command to get frequency of cpu */ + #undef GET_CPU_HZ_CMD + + /* Command to get size of a disk */ + #undef GET_SIZE_CMD + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET *************** *** 63,68 **** --- 69,77 ---- /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES + /* Define to 1 if libgtop is available */ + #undef HAVE_LIBGTOP + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H *************** *** 126,131 **** --- 135,146 ---- /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV + /* Command to list all cdroms on system */ + #undef LIST_CDROM_CMD + + /* Command to list all disks on system */ + #undef LIST_DISK_CMD + /* Name of package */ #undef PACKAGE diff -crN ./nautilus/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.sub *** ./nautilus/config.sub Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/config.sub Fri Dec 19 01:16:13 2003 *************** *** 1,9 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-01-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 1,9 ---- #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 29,36 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. --- 29,35 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. *************** *** 118,124 **** # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 117,123 ---- # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *************** *** 227,271 **** 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | clipper \ ! | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips | mipsbe | mipseb | mipsel | mipsle \ ! | mips16 \ ! | mips64 | mips64el \ ! | mips64vr | mips64vrel \ ! | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el \ ! | mips64vr4300 | mips64vr4300el \ ! | mips64vr5000 | mips64vr5000el \ ! | mipsisa32 | mipsisa32el \ ! | mipsisa32r2 | mipsisa32r2el \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | msp430 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | s390 | s390x \ ! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ! | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; --- 226,257 ---- 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ ! | d10v | d30v | dsp16xx \ ! | fr30 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el | mips64vr4300 \ ! | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ ! | mipsisa32 \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | s390 | s390x \ ! | sh | sh[34] | sh[34]eb | shbe | shle \ ! | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ ! | stormy16 | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 \ | we32k \ ! | x86 | xscale \ | z8k) basic_machine=$basic_machine-unknown ;; *************** *** 292,345 **** 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ ! | clipper-* | cydra-* \ ! | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ | m32r-* \ ! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ! | mips16-* \ ! | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ ! | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* \ ! | mips64vr5000-* | mips64vr5000el-* \ ! | mipsisa32-* | mipsisa32el-* \ ! | mipsisa32r2-* | mipsisa32r2el-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39-* | mipstx39el-* \ ! | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | s390-* | s390x-* \ ! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ ! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; --- 278,315 ---- 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alphapca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armv*-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c54x-* \ ! | clipper-* | cray2-* | cydra-* \ ! | d10v-* | d30v-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | m32r-* \ ! | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ ! | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ ! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | s390-* | s390x-* \ ! | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ ! | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | ymp-* \ | z8k-*) ;; *************** *** 404,413 **** basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd --- 374,379 ---- *************** *** 428,435 **** basic_machine=c38-convex os=-bsd ;; ! cray | j90) ! basic_machine=j90-cray os=-unicos ;; crds | unos) --- 394,409 ---- basic_machine=c38-convex os=-bsd ;; ! cray | ymp) ! basic_machine=ymp-cray ! os=-unicos ! ;; ! cray2) ! basic_machine=cray2-cray ! os=-unicos ! ;; ! [cjt]90) ! basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) *************** *** 444,457 **** decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola --- 418,423 ---- *************** *** 632,637 **** --- 598,611 ---- basic_machine=m68k-atari os=-mint ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; *************** *** 646,655 **** basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos --- 620,625 ---- *************** *** 722,731 **** np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; --- 692,697 ---- *************** *** 733,742 **** basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose --- 699,704 ---- *************** *** 759,777 **** pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) --- 721,739 ---- pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) *************** *** 786,807 **** power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ! ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ! ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; --- 748,769 ---- power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ! ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ! ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; *************** *** 826,837 **** basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; --- 788,793 ---- *************** *** 839,845 **** basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; --- 795,801 ---- basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs) basic_machine=sparclite-wrs os=-vxworks ;; *************** *** 906,922 **** os=-dynix ;; t3e) ! basic_machine=alphaev5-cray os=-unicos ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff --- 862,870 ---- os=-dynix ;; t3e) ! basic_machine=t3e-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff *************** *** 927,936 **** tx39el) basic_machine=mipstx39el-unknown ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; tower | tower-32) basic_machine=m68k-ncr ;; --- 875,880 ---- *************** *** 955,962 **** os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks --- 899,906 ---- os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks *************** *** 977,989 **** basic_machine=hppa1.1-winbond os=-proelf ;; ! xps | xps100) ! basic_machine=xps100-honeywell ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim --- 921,937 ---- basic_machine=hppa1.1-winbond os=-proelf ;; ! windows32) ! basic_machine=i386-pc ! os=-windows32-msvcrt ;; ! xmp) ! basic_machine=xmp-cray os=-unicos ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim *************** *** 1004,1009 **** --- 952,964 ---- op60c) basic_machine=hppa1.1-oki ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; romp) basic_machine=romp-ibm ;; *************** *** 1023,1038 **** we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) --- 978,990 ---- we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) *************** *** 1047,1052 **** --- 999,1008 ---- pmac | pmac-mpw) basic_machine=powerpc-apple ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *************** *** 1109,1120 **** | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -microbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1065,1074 ---- | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) *************** *** 1126,1135 **** ;; esac ;; - -nto-qnx*) - ;; -nto*) ! os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ --- 1080,1087 ---- ;; esac ;; -nto*) ! os=-nto-qnx ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ *************** *** 1168,1187 **** -acis*) os=-aos ;; - -atheos*) - os=-atheos - ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; - -nova*) - os=-rtmk-nova - ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk --- 1120,1133 ---- -acis*) os=-aos ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk *************** *** 1220,1227 **** -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; --- 1166,1173 ---- -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; *************** *** 1254,1264 **** arm*-semi) os=-aout ;; - # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) --- 1200,1209 ---- arm*-semi) os=-aout ;; pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) *************** *** 1285,1293 **** mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1230,1235 ---- *************** *** 1351,1369 **** *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) --- 1293,1311 ---- *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) *************** *** 1435,1441 **** -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) --- 1377,1383 ---- -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; -aux*) diff -crN ./nautilus/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/configure *** ./nautilus/configure Mon Sep 8 22:02:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/configure Fri Dec 19 01:17:59 2003 *************** *** 1,6 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. --- 1,6 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. *************** *** 36,45 **** PS4='+ ' # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var --- 36,42 ---- PS4='+ ' # NLS nuisances. ! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var *************** *** 85,99 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 82,96 ---- # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 467,473 **** # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ART_REQUIRED BONOBO_ACTIVATION_REQUIRED BONOBO_REQUIRED BONOBO_UI_REQUIRED EEL_REQUIRED ESOUND_REQUIRED GLIB_REQUIRED GNOME_DESKTOP_REQUIRED GNOME_REQUIRED GNOME_UI_REQUIRED GNOME_VFS_REQUIRED ORBIT_REQUIRED PANGO_REQUIRED GTK_REQUIRED MEDUSA_REQUIRED RSVG_REQUIRED XML_REQUIRED STARTUP_NOTIFICATION_REQUIRED INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL PKG_CONFIG STARTUP_NOTIFICATION_PACKAGE ALL_CFLAGS ALL_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ENABLE_PROFILER ENABLE_PROFILER_TRUE ENABLE_PROFILER_FALSE POPT_LIBS GLIB_GENMARSHAL ORBIT_IDL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_CDDA_TRUE HAVE_CDDA_FALSE JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW MEDUSA_CFLAGS MEDUSA_LIBS LIBJPEG GIMPHWRAPBOX_CFLAGS GSEQUENCE_CFLAGS LIBEGG_CFLAGS LIBNAUTILUS_CFLAGS LIBNAUTILUS_LIBS LIBNAUTILUS_IDL_INCLUDES CORE_CFLAGS CORE_LIBS CORE_IDL_INCLUDES COMPONENT_CFLAGS COMPONENT_LIBS EMBLEM_COMPONENT_CFLAGS EMBLEM_COMPONENT_LIBS DISABLE_DEPRECATED_CFLAGS ENABLE_HARDWARE_VIEW_TRUE ENABLE_HARDWARE_VIEW_FALSE CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. --- 464,470 ---- # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ART_REQUIRED BONOBO_ACTIVATION_REQUIRED BONOBO_REQUIRED BONOBO_UI_REQUIRED EEL_REQUIRED ESOUND_REQUIRED GLIB_REQUIRED GNOME_DESKTOP_REQUIRED GNOME_REQUIRED GNOME_UI_REQUIRED GNOME_VFS_REQUIRED ORBIT_REQUIRED PANGO_REQUIRED GTK_REQUIRED MEDUSA_REQUIRED RSVG_REQUIRED XML_REQUIRED STARTUP_NOTIFICATION_REQUIRED INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL PKG_CONFIG STARTUP_NOTIFICATION_PACKAGE POPT_LIBS ALL_CFLAGS ALL_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ENABLE_PROFILER ENABLE_PROFILER_TRUE ENABLE_PROFILER_FALSE GLIB_GENMARSHAL ORBIT_IDL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_CDDA_TRUE HAVE_CDDA_FALSE JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW MEDUSA_CFLAGS MEDUSA_LIBS LIBJPEG GIMPHWRAPBOX_CFLAGS GSEQUENCE_CFLAGS LIBEGG_CFLAGS LIBNAUTILUS_CFLAGS LIBNAUTILUS_LIBS LIBNAUTILUS_IDL_INCLUDES CORE_CFLAGS CORE_LIBS CORE_IDL_INCLUDES COMPONENT_CFLAGS COMPONENT_LIBS EMBLEM_COMPONENT_CFLAGS EMBLEM_COMPONENT_LIBS LSDEV_PATH LSATTR_PATH DISABLE_DEPRECATED_CFLAGS LIBGTOP_CFLAGS LIBGTOP_LIBS ENABLE_HARDWARE_VIEW_TRUE ENABLE_HARDWARE_VIEW_FALSE CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. *************** *** 1021,1027 **** --disable-libtool-lock avoid locking (might break parallel builds) --enable-profiler Enable profiler --enable-more-warnings Maximum compiler warnings ! --enable-hardware Enable (broken, Linux only) hardware view --disable-schemas-install Disable the schemas installation Optional Packages: --- 1018,1024 ---- --disable-libtool-lock avoid locking (might break parallel builds) --enable-profiler Enable profiler --enable-more-warnings Maximum compiler warnings ! --enable-hardware Enable (broken, Linux/AIX only) hardware view --disable-schemas-install Disable the schemas installation Optional Packages: *************** *** 1121,1127 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ --- 1118,1124 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ *************** *** 1173,1226 **** # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. - # Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. - # Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= - ac_configure_args0= - ac_configure_args1= ac_sep= ! ac_must_keep_next=false ! for ac_pass in 1 2 do ! for ac_arg ! do ! case $ac_arg in ! -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ! -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ! | -silent | --silent | --silen | --sile | --sil) ! continue ;; ! *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! case $ac_pass in ! 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ! 2) ! ac_configure_args1="$ac_configure_args1 '$ac_arg'" ! if test $ac_must_keep_next = true; then ! ac_must_keep_next=false # Got value, back to normal. ! else ! case $ac_arg in ! *=* | --config-cache | -C | -disable-* | --disable-* \ ! | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ! | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ! | -with-* | --with-* | -without-* | --without-* | --x) ! case "$ac_configure_args0 " in ! "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ! esac ! ;; ! -* ) ac_must_keep_next=true ;; ! esac ! fi ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! # Get rid of the leading space. ! ac_sep=" " ! ;; ! esac ! done done - $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } - $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there --- 1170,1193 ---- # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. # Also quote any args containing shell meta-characters. ac_configure_args= ac_sep= ! for ac_arg do ! case $ac_arg in ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c | -n ) continue ;; ! -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ! | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ! continue ;; ! *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! # Get rid of the leading space. ! ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there *************** *** 1489,1495 **** ! am__api_version="1.6" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then --- 1456,1462 ---- ! am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then *************** *** 1704,1718 **** test -n "$AWK" && break done ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="$(MAKE)"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --- 1671,1685 ---- test -n "$AWK" && break done ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="${MAKE}"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` *************** *** 1741,1746 **** --- 1708,1723 ---- { (exit 1); exit 1; }; } fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + # Define the identity of the package. PACKAGE=nautilus VERSION=2.4.0 *************** *** 1869,1881 **** - # Add the stamp file to the list of files AC keeps track of, - # along with our hook. ac_config_headers="$ac_config_headers config.h" - - echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case --- 1846,1854 ---- *************** *** 1978,1984 **** # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU --- 1951,1957 ---- # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU *************** *** 2328,2337 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 2301,2308 ---- fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. *************** *** 2356,2366 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2327,2333 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2371,2377 **** } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. --- 2338,2344 ---- } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. *************** *** 2390,2428 **** # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= ! # b.out is created by i960 compilers. ! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ! do test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ! ;; ! conftest.$ac_ext ) ! # This is the source file. ! ;; ! [ab].out ) ! # We found the default executable, but exeext='' is most ! # certainly right. ! break;; ! *.* ) ! ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool, ! # but it would be cool to find out if it's true. Does anybody ! # maintain Libtool? --akim. ! export ac_cv_exeext ! break;; ! * ) ! break;; esac done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! See \`config.log' for more details." >&5 echo "$as_me: error: C compiler cannot create executables ! See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi --- 2357,2383 ---- # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= ! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ! a.out ) # We found the default executable, but exeext='' is most ! # certainly right. ! break;; ! *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool --akim. ! export ac_cv_exeext ! break;; ! * ) break;; esac done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! check \`config.log' for details." >&5 echo "$as_me: error: C compiler cannot create executables ! check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi *************** *** 2449,2459 **** cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi --- 2404,2412 ---- cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'." >&2;} { (exit 1); exit 1; }; } fi fi *************** *** 2461,2467 **** echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ! rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. --- 2414,2420 ---- echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ! rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. *************** *** 2492,2501 **** esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2445,2452 ---- esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi *************** *** 2513,2523 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2464,2470 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2542,2553 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2489,2497 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi *************** *** 2564,2574 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2508,2514 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2596,2603 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2536,2542 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2617,2627 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2556,2562 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2646,2653 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2581,2587 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2678,2688 **** ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include --- 2612,2618 ---- ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include *************** *** 2745,2752 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext done --- 2675,2681 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext done *************** *** 2797,2807 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int --- 2726,2732 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration int *************** *** 2827,2844 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () --- 2752,2764 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_declaration int main () *************** *** 2863,2870 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 2783,2789 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 2877,2884 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c --- 2796,2802 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c *************** *** 2936,2942 **** if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode --- 2854,2860 ---- if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode *************** *** 2957,2962 **** --- 2875,2892 ---- + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + + echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then *************** *** 2965,2975 **** # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 2895,2901 ---- # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 2999,3009 **** # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 2925,2931 ---- # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 3033,3058 **** ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_c_bigendian=no fi rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # It does not; compile a test program. if test "$cross_compiling" = yes; then # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } --- 2955,2974 ---- ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_c_bigendian=no fi rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # It does not; compile a test program. if test "$cross_compiling" = yes; then # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } *************** *** 3092,3109 **** fi else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 3008,3020 ---- fi else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () { *************** *** 3132,3139 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ac_cv_c_bigendian=yes fi --- 3043,3049 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi *************** *** 3168,3178 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 3078,3084 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 3243,3250 **** ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3149,3155 ---- ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3269,3279 **** LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 3174,3180 ---- LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 3305,3312 **** ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 3206,3212 ---- ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 3629,3638 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 3529,3536 ---- fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. *************** *** 3662,3672 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 3560,3566 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 3694,3701 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3588,3594 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3715,3725 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 3608,3614 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 3744,3751 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3633,3639 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3776,3786 **** ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include --- 3664,3670 ---- ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include *************** *** 3843,3850 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext done --- 3727,3733 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext done *************** *** 3895,3905 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int --- 3778,3784 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration int *************** *** 3925,3942 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () --- 3804,3816 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_declaration int main () *************** *** 3961,3968 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 3835,3841 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 3975,3982 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c --- 3848,3854 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c *************** *** 4034,4040 **** if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode --- 3906,3912 ---- if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode *************** *** 4054,4059 **** --- 3926,3943 ---- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 4077,4098 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 3961,3972 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" ! #include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4115,4122 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3989,3995 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 4126,4136 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 3999,4005 ---- # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4154,4161 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 4023,4029 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 4184,4205 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 4052,4063 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" ! #include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4222,4229 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 4080,4086 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 4233,4243 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 4090,4096 ---- # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4261,4268 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 4114,4120 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 4275,4284 **** if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&5 ! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 4127,4134 ---- if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 ! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi *************** *** 4376,4390 **** echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="$(MAKE)"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --- 4226,4240 ---- echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="${MAKE}"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` *************** *** 4668,4674 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 4518,4540 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 4688,4780 **** echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 ! echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ! echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 ! if test "${lt_cv_path_SED+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! # Loop through the user's path and test for sed and gsed. ! # Then use that list of sed's as ones to test for truncation. ! as_executable_p="test -f" ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_prog in sed gsed; do ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ! _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" ! fi ! done ! done ! done ! ! # Create a temporary directory, and hook for its removal unless debugging. ! $debug || ! { ! trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ! trap '{ (exit 1); exit 1; }' 1 2 13 15 ! } ! ! # Create a (secure) tmp directory for tmp files. ! : ${TMPDIR=/tmp} ! { ! tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && ! test -n "$tmp" && test -d "$tmp" ! } || ! { ! tmp=$TMPDIR/sed$$-$RANDOM ! (umask 077 && mkdir $tmp) ! } || ! { ! echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ! { (exit 1); exit 1; } ! } ! _max=0 ! _count=0 ! # Add /usr/xpg4/bin/sed as it is typically found on Solaris ! # along with /bin/sed that truncates output. ! for _sed in $_sed_list /usr/xpg4/bin/sed; do ! test ! -f ${_sed} && break ! cat /dev/null > "$tmp/sed.in" ! _count=0 ! echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" ! # Check for GNU sed and select it if it is found. ! if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then ! lt_cv_path_SED=${_sed} ! break ! fi ! while true; do ! cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" ! mv "$tmp/sed.tmp" "$tmp/sed.in" ! cp "$tmp/sed.in" "$tmp/sed.nl" ! echo >>"$tmp/sed.nl" ! ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break ! cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break ! # 40000 chars as input seems more than enough ! test $_count -gt 10 && break ! _count=`expr $_count + 1` ! if test $_count -gt $_max; then ! _max=$_count ! lt_cv_path_SED=$_sed ! fi ! done ! done ! rm -rf "$tmp" ! ! fi ! ! if test "X$SED" != "X"; then ! lt_cv_path_SED=$SED ! else ! SED=$lt_cv_path_SED ! fi ! echo "$as_me:$LINENO: result: $SED" >&5 ! echo "${ECHO_T}$SED" >&6 ! ! echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 ! echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else --- 4554,4561 ---- echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 ! echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 ! echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else *************** *** 4851,4859 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 4632,4640 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 4875,4881 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4656,4662 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM *************** *** 4946,4954 **** lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4727,4732 ---- *************** *** 5002,5013 **** lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix* | nonstopux*) symcode='[BCDEGRST]' ;; - osf*) - symcode='[BCDEGQRST]' - ;; solaris* | sysv5*) symcode='[BDT]' ;; --- 4780,4788 ---- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix*) symcode='[BCDEGRST]' ;; solaris* | sysv5*) symcode='[BDT]' ;; *************** *** 5116,5122 **** (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 4891,4897 ---- (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" *************** *** 5186,5239 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include #include - int - main () - { - - ; - return 0; - } _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_header_stdc=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF --- 4961,5003 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_header_stdc=no fi ! rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF *************** *** 5251,5261 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF --- 5015,5021 ---- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF *************** *** 5276,5293 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) \ ! (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --- 5036,5048 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) *************** *** 5320,5327 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ac_cv_header_stdc=no fi --- 5075,5081 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi *************** *** 5360,5370 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> --- 5114,5120 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> *************** *** 5384,5391 **** eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext --- 5134,5140 ---- eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 5420,5430 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 5169,5175 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 5443,5450 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 5188,5194 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 5456,5466 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 5200,5206 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 5483,5490 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 5223,5229 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 5497,5528 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 5236,5249 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 5548,5554 **** - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) --- 5269,5274 ---- *************** *** 5864,5870 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5867 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 5584,5590 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5587 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 5904,5914 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5624,5630 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5933,5940 **** lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 5649,5655 ---- lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 6106,6112 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 5821,5827 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 6149,6155 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 5864,5870 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 6193,6199 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 5908,5918 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' ! else ! lt_cv_prog_cc_wl='-Wl,' ! fi ;; uts4*) *************** *** 6233,6243 **** CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5952,5958 ---- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 6277,6284 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_prog_cc_pic_works=no fi --- 5992,5998 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_prog_cc_pic_works=no fi *************** *** 6321,6331 **** LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 6035,6041 ---- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 6350,6357 **** lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" --- 6060,6066 ---- lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" *************** *** 6393,6399 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:6396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then --- 6102,6108 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:6105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then *************** *** 6435,6445 **** ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 6144,6150 ---- ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 6471,6478 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" --- 6176,6182 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" *************** *** 6520,6530 **** compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 6224,6230 ---- compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 6556,6563 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" --- 6256,6262 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" *************** *** 6586,6591 **** --- 6285,6291 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 6729,6735 **** # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 6429,6435 ---- # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; *************** *** 6738,6744 **** set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 6438,6443 ---- *************** *** 6843,6867 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # Test if we are trying to use run time linking or normal ! # AIX style linking. If -brtl is somewhere in LDFLAGS, we ! # need to do runtime linking. ! case $host_os in aix4.[23]|aix4.[23].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 6542,6554 ---- aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" + use_runtimelinking="" else ! aix_use_runtimelinking=yes ! export_dynamic_flag_spec='-bexpall' exp_sym_flag='-bexport' no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' fi # When large executables or shared objects are built, AIX ld can *************** *** 6896,6910 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 6583,6589 ---- shared_flag='-shared' else # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to *************** *** 6914,6921 **** # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 6593,6600 ---- # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' *************** *** 6928,6934 **** allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 6607,6613 ---- allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 6970,6978 **** esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 6649,6656 ---- esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes *************** *** 7024,7037 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 6702,6714 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 7059,7065 **** hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 6736,6742 ---- hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else *************** *** 7069,7075 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 6746,6752 ---- hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac *************** *** 7181,7203 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 6858,6870 ---- ;; sysv4) ! if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! else ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 7345,7353 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 7012,7017 ---- *************** *** 7369,7392 **** fi ;; esac ! # AIX (on Power*) has no versioning support, so currently we can ! # not hardcode correct soname into executable. Probably we can ! # add versioning support to collect2, so additional links can ! # be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so ! # instead of lib.a to let people know that these are not ! # typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH fi - hardcode_into_libs=yes ;; amigaos*) --- 7033,7044 ---- fi ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH + hardcode_into_libs=yes fi ;; amigaos*) *************** *** 7434,7440 **** ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' --- 7086,7092 ---- ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' *************** *** 7517,7533 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 7169,7182 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 7572,7601 **** # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - - # Find out which ABI we are using (multilib Linux x86_64 hack). - libsuff= - case "$host_cpu" in - x86_64*|s390x*) - echo '#line 7580 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - ;; - esac - fi - rm -rf conftest* - ;; - *) - ;; - esac - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) --- 7221,7226 ---- *************** *** 7655,7666 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 7280,7290 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 7703,7714 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 7327,7332 ---- *************** *** 7774,7780 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 7392,7398 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 7831,7874 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else ! char (*f) () = shl_load; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != shl_load; ; return 0; } --- 7449,7479 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else ! f = shl_load; #endif ; return 0; } *************** *** 7888,7895 **** ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7493,7499 ---- ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7908,7918 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7512,7518 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7944,7951 **** ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7544,7550 ---- ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7963,8006 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char dlopen (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else ! char (*f) () = dlopen; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != dlopen; ; return 0; } --- 7562,7592 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char dlopen (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else ! f = dlopen; #endif ; return 0; } *************** *** 8020,8027 **** ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7606,7612 ---- ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 8040,8050 **** LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7625,7631 ---- LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 8076,8083 **** ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7657,7663 ---- ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 8097,8107 **** LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7677,7683 ---- LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 8133,8140 **** ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7709,7715 ---- ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 8154,8164 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7729,7735 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 8190,8197 **** ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7761,7767 ---- ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 8249,8255 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5 + echo $ECHO_N "checking for poptGetArg in -lpopt... $ECHO_C" >&6 + if test "${ac_cv_lib_popt_poptGetArg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpopt $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char poptGetArg (); + int + main () + { + poptGetArg (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_popt_poptGetArg=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_lib_popt_poptGetArg=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetArg" >&5 + echo "${ECHO_T}$ac_cv_lib_popt_poptGetArg" >&6 + if test $ac_cv_lib_popt_poptGetArg = yes; then + POPT_LIBS=-lpopt + else + if test "${ac_cv_header_popt_h+set}" = set; then + echo "$as_me:$LINENO: checking for popt.h" >&5 + echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 + if test "${ac_cv_header_popt_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 + echo "${ECHO_T}$ac_cv_header_popt_h" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking popt.h usability" >&5 + echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + $ac_includes_default + #include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_compiler=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking popt.h presence" >&5 + echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; + esac + echo "$as_me:$LINENO: checking for popt.h" >&5 + echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 + if test "${ac_cv_header_popt_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_popt_h=$ac_header_preproc + fi + echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 + echo "${ECHO_T}$ac_cv_header_popt_h" >&6 + + fi + if test $ac_cv_header_popt_h = yes; then + : + else + { { echo "$as_me:$LINENO: error: + *** Couldn't find popt. Please download and install from + *** ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ and try again." >&5 + echo "$as_me: error: + *** Couldn't find popt. Please download and install from + *** ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ and try again." >&2;} + { (exit 1); exit 1; }; } + fi + + + fi + + + succeeded=no *************** *** 9395,9405 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 9136,9142 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 9418,9425 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9155,9161 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9431,9441 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 9167,9173 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 9458,9465 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 9190,9196 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 9472,9503 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 9203,9216 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 9527,9537 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () --- 9240,9246 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include int main () *************** *** 9556,9563 **** am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9265,9271 ---- am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9595,9605 **** echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 9303,9309 ---- echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 9618,9625 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9322,9328 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9631,9641 **** echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 9334,9340 ---- echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 9658,9665 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 9357,9363 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 9672,9703 **** { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 --- 9370,9383 ---- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 *************** *** 9724,9734 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include --- 9404,9410 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include *************** *** 9755,9762 **** gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9431,9437 ---- gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9777,9820 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 9452,9482 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 9834,9841 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9496,9502 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9867,9877 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 9528,9534 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9903,9910 **** ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9560,9566 ---- ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9922,9932 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 9578,9584 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9958,9965 **** ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9610,9616 ---- ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9988,9998 **** LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 9639,9645 ---- LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10024,10031 **** ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9671,9677 ---- ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10062,10105 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 9708,9738 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 10119,10126 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9752,9758 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10198,10203 **** --- 9830,9837 ---- echo "${ECHO_T}no" >&6 fi if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" for ac_func in dcgettext do *************** *** 10209,10252 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 9843,9873 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 10266,10273 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9887,9893 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10360,10370 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 9980,9986 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 10391,10398 **** DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! case $host in *-*-solaris*) echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --- 10007,10013 ---- DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 case $host in *-*-solaris*) echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 *************** *** 10402,10445 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char bind_textdomain_codeset (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bind_textdomain_codeset (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) choke me #else ! char (*f) () = bind_textdomain_codeset; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != bind_textdomain_codeset; ; return 0; } --- 10017,10047 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char bind_textdomain_codeset (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bind_textdomain_codeset (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) choke me #else ! f = bind_textdomain_codeset; #endif ; return 0; } *************** *** 10459,10466 **** ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_bind_textdomain_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10061,10067 ---- ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10483,10488 **** --- 10084,10090 ---- esac fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else gt_cv_have_gettext=no *************** *** 10767,10777 **** LIBS="-lpopt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10369,10375 ---- LIBS="-lpopt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10803,10810 **** ac_cv_lib_popt_poptGetArg=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_popt_poptGetArg=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10401,10407 ---- ac_cv_lib_popt_poptGetArg=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_popt_poptGetArg=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10829,10839 **** echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 10426,10432 ---- echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 10852,10859 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 10445,10451 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 10865,10875 **** echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 10457,10463 ---- echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 10892,10899 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 10480,10486 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 10906,10937 **** { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for popt.h" >&5 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 --- 10493,10506 ---- { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for popt.h" >&5 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 *************** *** 11021,11064 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 10590,10620 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 11078,11085 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10634,10640 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11120,11130 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 10675,10681 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 11143,11150 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 10694,10700 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 11156,11166 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 10706,10712 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 11183,11190 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 10729,10735 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 11197,11228 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 10742,10755 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 11259,11302 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 10786,10816 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 11316,11323 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10830,10836 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11444,11454 **** # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 10957,10963 ---- # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 11472,11479 **** ac_x_includes= else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir --- 10981,10987 ---- ac_x_includes= else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir *************** *** 11492,11502 **** LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () --- 11000,11006 ---- LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include int main () *************** *** 11523,11530 **** ac_x_libraries= else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do --- 11027,11033 ---- ac_x_libraries= else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do *************** *** 11594,11604 **** ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 11097,11103 ---- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 11623,11630 **** ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11122,11128 ---- ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11636,11646 **** LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 11134,11140 ---- LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 11665,11672 **** ac_R_space=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11159,11165 ---- ac_R_space=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11696,11706 **** ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11189,11195 ---- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 11732,11739 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then --- 11221,11227 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then *************** *** 11743,11753 **** LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11231,11237 ---- LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 11779,11786 **** ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dnet_dnet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11263,11269 ---- ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dnet_dnet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11802,11812 **** LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11285,11291 ---- LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 11838,11845 **** ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dnet_stub_dnet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11317,11323 ---- ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dnet_stub_dnet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11871,11914 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char gethostbyname (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else ! char (*f) () = gethostbyname; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != gethostbyname; ; return 0; } --- 11349,11379 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char gethostbyname (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else ! f = gethostbyname; #endif ; return 0; } *************** *** 11928,11935 **** ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11393,11399 ---- ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11947,11957 **** LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11411,11417 ---- LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 11983,11990 **** ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_nsl_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11443,11449 ---- ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_nsl_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12006,12016 **** LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11465,11471 ---- LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12042,12049 **** ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_bsd_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11497,11503 ---- ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_bsd_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12072,12115 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char connect (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_connect) || defined (__stub___connect) choke me #else ! char (*f) () = connect; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != connect; ; return 0; } --- 11526,11556 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char connect (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_connect) || defined (__stub___connect) choke me #else ! f = connect; #endif ; return 0; } *************** *** 12129,12136 **** ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11570,11576 ---- ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12148,12158 **** LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11588,11594 ---- LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12184,12191 **** ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_socket_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11620,11626 ---- ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_socket_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12207,12250 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char remove (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_remove) || defined (__stub___remove) choke me #else ! char (*f) () = remove; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != remove; ; return 0; } --- 11642,11672 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char remove (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char remove (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_remove) || defined (__stub___remove) choke me #else ! f = remove; #endif ; return 0; } *************** *** 12264,12271 **** ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11686,11692 ---- ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12283,12293 **** LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11704,11710 ---- LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12319,12326 **** ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_posix_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11736,11742 ---- ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_posix_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12342,12385 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shmat (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shmat) || defined (__stub___shmat) choke me #else ! char (*f) () = shmat; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != shmat; ; return 0; } --- 11758,11788 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shmat (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shmat (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shmat) || defined (__stub___shmat) choke me #else ! f = shmat; #endif ; return 0; } *************** *** 12399,12406 **** ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11802,11808 ---- ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12418,12428 **** LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11820,11826 ---- LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12454,12461 **** ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_ipc_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11852,11858 ---- ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_ipc_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12488,12498 **** LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11885,11891 ---- LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12524,12531 **** ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_ICE_IceConnectionNumber=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11917,11923 ---- ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_ICE_IceConnectionNumber=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12570,12580 **** LIBS="-lX11 $x_libs_for_checks $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 11962,11968 ---- LIBS="-lX11 $x_libs_for_checks $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 12606,12613 **** ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_X11_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11994,12000 ---- ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_X11_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12655,12665 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 12042,12048 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 12678,12685 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12061,12067 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12691,12701 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 12073,12079 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 12718,12725 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 12096,12102 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 12732,12763 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 12109,12122 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 12972,12982 **** LIBS="-ljpeg -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 12331,12337 ---- LIBS="-ljpeg -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 13008,13015 **** ac_cv_lib_jpeg_jpeg_start_decompress=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_jpeg_jpeg_start_decompress=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12363,12369 ---- ac_cv_lib_jpeg_jpeg_start_decompress=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_jpeg_jpeg_start_decompress=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 13032,13042 **** echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 12386,12392 ---- echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 13055,13062 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12405,12411 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 13068,13078 **** echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 12417,12423 ---- echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 13095,13102 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 12440,12446 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 13109,13140 **** { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for jpeglib.h" >&5 echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 --- 12453,12466 ---- { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for jpeglib.h" >&5 echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 *************** *** 13209,13219 **** echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 12535,12541 ---- echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 13238,13245 **** has_option=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12560,12566 ---- has_option=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 13275,13281 **** LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" ! LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" --- 12596,12607 ---- LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" ! LIBNAUTILUS_IDL_INCLUDES_tmp="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" ! LIBNAUTILUS_IDL_INCLUDES="" ! for dir in ${LIBNAUTILUS_IDL_INCLUDES_tmp} ! do ! LIBNAUTILUS_IDL_INCLUDES="${LIBNAUTILUS_IDL_INCLUDES} -I${dir}" ! done CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" *************** *** 13283,13289 **** CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" ! CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" --- 12609,12619 ---- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" ! CORE_IDL_INCLUDES_tmp="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" ! for dir in ${CORE_IDL_INCLUDES_tmp} ! do ! CORE_IDL_INCLUDES="${CORE_IDL_INCLUDES} -I${dir}" ! done COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" *************** *** 13308,13323 **** hw_view=disabled # Check whether --enable-hardware or --disable-hardware was given. if test "${enable_hardware+set}" = set; then enableval="$enable_hardware" hw_view=enabled ! fi; ! if test "x`(uname -s) 2>/dev/null`" != "xLinux"; then ! hw_view=disabled fi if test "$hw_view" = "enabled"; then ENABLE_HARDWARE_VIEW_TRUE= --- 12638,12894 ---- + + + + + + + + case $host_os in + aix*) + # Extract the first word of "lsdev", so it can be a program name with args. + set dummy lsdev; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_LSDEV_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $LSDEV_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_LSDEV_PATH="$LSDEV_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LSDEV_PATH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + ;; + esac + fi + LSDEV_PATH=$ac_cv_path_LSDEV_PATH + + if test -n "$LSDEV_PATH"; then + echo "$as_me:$LINENO: result: $LSDEV_PATH" >&5 + echo "${ECHO_T}$LSDEV_PATH" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test x"$LSDEV_PATH" != "x" + then + cat >>confdefs.h <<_ACEOF + #define LIST_DISK_CMD "$LSDEV_PATH -C -c disk -F \\\"name|class|status|location|description\\\"" + _ACEOF + + cat >>confdefs.h <<_ACEOF + #define LIST_CDROM_CMD "$LSDEV_PATH -C -c cdrom -F \\\"name|class|status|location|description\\\"" + _ACEOF + + fi + # Extract the first word of "lsattr", so it can be a program name with args. + set dummy lsattr; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_LSATTR_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $LSATTR_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_LSATTR_PATH="$LSATTR_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LSATTR_PATH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + ;; + esac + fi + LSATTR_PATH=$ac_cv_path_LSATTR_PATH + + if test -n "$LSATTR_PATH"; then + echo "$as_me:$LINENO: result: $LSATTR_PATH" >&5 + echo "${ECHO_T}$LSATTR_PATH" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test x"$LSATTR_PATH" != "x" + then + cat >>confdefs.h <<_ACEOF + #define GET_SIZE_CMD "$LSATTR_PATH -E -l %s -F value -a size_in_mb" + _ACEOF + + cat >>confdefs.h <<_ACEOF + #define GET_CPU_HZ_CMD "$LSATTR_PATH -E -l proc%d -F value -a frequency" + _ACEOF + + fi + ;; + esac + + + + + hw_view=disabled # Check whether --enable-hardware or --disable-hardware was given. if test "${enable_hardware+set}" = set; then enableval="$enable_hardware" + + case $host_os in + linux*) hw_view=enabled ! ;; ! aix*) ! ! LIBGTOP_REQUIRED=2.0.0 ! ! ! ! ! ! succeeded=no ! ! if test -z "$PKG_CONFIG"; then ! # Extract the first word of "pkg-config", so it can be a program name with args. ! set dummy pkg-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case $PKG_CONFIG in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ! ;; ! esac ! fi ! PKG_CONFIG=$ac_cv_path_PKG_CONFIG ! ! if test -n "$PKG_CONFIG"; then ! echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ! echo "${ECHO_T}$PKG_CONFIG" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for libgtop-2.0 >= $LIBGTOP_REQUIRED" >&5 + echo $ECHO_N "checking for libgtop-2.0 >= $LIBGTOP_REQUIRED... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "libgtop-2.0 >= $LIBGTOP_REQUIRED" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking LIBGTOP_CFLAGS" >&5 + echo $ECHO_N "checking LIBGTOP_CFLAGS... $ECHO_C" >&6 + LIBGTOP_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED"` + echo "$as_me:$LINENO: result: $LIBGTOP_CFLAGS" >&5 + echo "${ECHO_T}$LIBGTOP_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking LIBGTOP_LIBS" >&5 + echo $ECHO_N "checking LIBGTOP_LIBS... $ECHO_C" >&6 + LIBGTOP_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED"` + echo "$as_me:$LINENO: result: $LIBGTOP_LIBS" >&5 + echo "${ECHO_T}$LIBGTOP_LIBS" >&6 + else + LIBGTOP_CFLAGS="" + LIBGTOP_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBGTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + have_libgtop=yes + else + have_libtop=no + fi + + if test "x$have_libgtop" = "xyes"; then + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBGTOP 1 + _ACEOF + + + + hw_view=enabled + else + { echo "$as_me:$LINENO: WARNING: Hardware view disabled, AIX needs libgtop >= $LIBGTOP_REQUIRED" >&5 + echo "$as_me: WARNING: Hardware view disabled, AIX needs libgtop >= $LIBGTOP_REQUIRED" >&2;} + hw_view=disabled + fi + ;; + *) + { echo "$as_me:$LINENO: WARNING: Hardware view disabled, available only for linux and AIX" >&5 + echo "$as_me: WARNING: Hardware view disabled, available only for linux and AIX" >&2;} + hw_view=disabled + ;; + esac + fi; + + if test "$hw_view" = "enabled"; then ENABLE_HARDWARE_VIEW_TRUE= *************** *** 13582,13588 **** t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file --- 13153,13159 ---- t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file *************** *** 13642,13651 **** Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp --- 13213,13236 ---- Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp *************** *** 13705,13712 **** # configure, is in config.log if it exists. debug=false - ac_cs_recheck=false - ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF --- 13290,13295 ---- *************** *** 13741,13750 **** PS4='+ ' # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var --- 13324,13330 ---- PS4='+ ' # NLS nuisances. ! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var *************** *** 13790,13804 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 13370,13384 ---- # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 13961,13967 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 13541,13547 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 14001,14007 **** -h, --help print this help, then exit -V, --version print version number, then exit - -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] --- 13581,13586 ---- *************** *** 14024,14030 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --- 13603,13609 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 14061,14069 **** case $ac_option in # Handling of the options. _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) --- 13640,13651 ---- case $ac_option in # Handling of the options. _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" ! exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) *************** *** 14085,14093 **** $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --- 13667,13672 ---- *************** *** 14102,14121 **** shift done - ac_configure_extra_args= - - if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" - fi - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - _ACEOF cat >>$CONFIG_STATUS <<_ACEOF --- 13681,13686 ---- *************** *** 14194,14202 **** test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi - # Have a temporary directory for convenience. Make it in the build tree - # simply because there is no reason to put it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { --- 13759,13764 ---- *************** *** 14205,14221 **** } # Create a (secure) tmp directory for tmp files. ! { ! tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } --- 13767,13783 ---- } # Create a (secure) tmp directory for tmp files. ! : ${TMPDIR=/tmp} { ! tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=$TMPDIR/cs$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in $TMPDIR" >&2 { (exit 1); exit 1; } } *************** *** 14284,14289 **** --- 13846,13852 ---- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t + s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@ACLOCAL@,$ACLOCAL,;t t *************** *** 14315,14320 **** --- 13878,13885 ---- s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t + s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t + s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@CPP@,$CPP,;t t s,@LN_S@,$LN_S,;t t s,@build@,$build,;t t *************** *** 14332,14337 **** --- 13897,13903 ---- s,@LIBTOOL@,$LIBTOOL,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t + s,@POPT_LIBS@,$POPT_LIBS,;t t s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t s,@ALL_LIBS@,$ALL_LIBS,;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t *************** *** 14372,14378 **** s,@ENABLE_PROFILER@,$ENABLE_PROFILER,;t t s,@ENABLE_PROFILER_TRUE@,$ENABLE_PROFILER_TRUE,;t t s,@ENABLE_PROFILER_FALSE@,$ENABLE_PROFILER_FALSE,;t t - s,@POPT_LIBS@,$POPT_LIBS,;t t s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t --- 13938,13943 ---- *************** *** 14401,14407 **** --- 13966,13976 ---- s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t + s,@LSDEV_PATH@,$LSDEV_PATH,;t t + s,@LSATTR_PATH@,$LSATTR_PATH,;t t s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t + s,@LIBGTOP_CFLAGS@,$LIBGTOP_CFLAGS,;t t + s,@LIBGTOP_LIBS@,$LIBGTOP_LIBS,;t t s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t *************** *** 14790,14796 **** cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then ! if diff $ac_file $tmp/config.h >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else --- 14359,14365 ---- cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then ! if cmp -s $ac_file $tmp/config.h 2>/dev/null; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else *************** *** 14838,14849 **** cat $tmp/config.h rm -f $tmp/config.h fi ! # Run the commands associated with the file. ! case $ac_file in ! config.h ) # update the timestamp ! echo 'timestamp for config.h' >"./stamp-h1" ! ;; ! esac done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF --- 14407,14425 ---- cat $tmp/config.h rm -f $tmp/config.h fi ! _am_stamp_count=`expr ${_am_stamp_count-0} + 1` ! echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || ! $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X$ac_file : 'X\(//\)[^/]' \| \ ! X$ac_file : 'X\(//\)$' \| \ ! X$ac_file : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X$ac_file | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF *************** *** 15048,15058 **** # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. --- 14624,14631 ---- # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null ! $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff -crN ./nautilus/cut-n-paste-code/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/Makefile.in *** ./nautilus/cut-n-paste-code/Makefile.in Mon Sep 8 22:02:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/Makefile.in Fri Dec 19 01:17:37 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,182 **** PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = widgets libegg gsequence subdir = cut-n-paste-code mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 174,240 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ SUBDIRS = widgets libegg gsequence subdir = cut-n-paste-code mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = README Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 184,190 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cut-n-paste-code/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 242,248 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cut-n-paste-code/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 252,261 **** --- 310,326 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 286,305 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 351,391 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 397,419 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 483,515 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -crN ./nautilus/cut-n-paste-code/gsequence/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/gsequence/Makefile.in *** ./nautilus/cut-n-paste-code/gsequence/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/gsequence/Makefile.in Fri Dec 19 01:17:37 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = noinst_LTLIBRARIES = libgsequence.la *************** *** 189,202 **** am_libgsequence_la_OBJECTS = gsequence.lo $(am__objects_1) libgsequence_la_OBJECTS = $(am_libgsequence_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gsequence.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 244,252 ---- am_libgsequence_la_OBJECTS = gsequence.lo $(am__objects_1) libgsequence_la_OBJECTS = $(am_libgsequence_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 204,210 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libgsequence_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libgsequence_la_SOURCES) --- 254,259 ---- *************** *** 215,221 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cut-n-paste-code/gsequence/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 264,270 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cut-n-paste-code/gsequence/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 223,229 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 272,278 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 236,264 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsequence.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 285,298 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 273,278 **** --- 307,315 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 298,317 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 335,375 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 368,375 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 426,433 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 398,416 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 456,481 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/cut-n-paste-code/libegg/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/Makefile.in *** ./nautilus/cut-n-paste-code/libegg/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/Makefile.in Fri Dec 19 01:17:38 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = noinst_LTLIBRARIES = libegg.la *************** *** 228,246 **** $(am__objects_4) $(am__objects_1) libegg_la_OBJECTS = $(am_libegg_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/egg-recent-item.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-model.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/egg-screen-exec.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/egg-screen-help.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/egg-screen-url.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/eggtreemultidnd.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 283,291 ---- $(am__objects_4) $(am__objects_1) libegg_la_OBJECTS = $(am_libegg_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 248,254 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libegg_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libegg_la_SOURCES) --- 293,298 ---- *************** *** 259,265 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cut-n-paste-code/libegg/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 303,309 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cut-n-paste-code/libegg/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 267,273 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 311,317 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 280,313 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-recent-item.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-recent-model.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-screen-exec.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-screen-help.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egg-screen-url.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtreemultidnd.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 324,337 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 322,327 **** --- 346,354 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 347,366 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 374,414 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 417,424 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 465,472 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 447,465 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-info-am regenerate-built-sources: --- 495,520 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am regenerate-built-sources: diff -crN ./nautilus/cut-n-paste-code/widgets/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/widgets/Makefile.in *** ./nautilus/cut-n-paste-code/widgets/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/widgets/Makefile.in Fri Dec 19 01:17:39 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = \ *************** *** 176,187 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 231,245 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 189,195 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cut-n-paste-code/widgets/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 247,253 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cut-n-paste-code/widgets/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 257,266 **** --- 315,331 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 291,310 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 356,396 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 402,424 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 488,520 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -crN ./nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.in *** ./nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/widgets/gimphwrapbox/Makefile.in Fri Dec 19 01:17:40 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = noinst_LTLIBRARIES = libgtkhwrapbox.la *************** *** 192,206 **** $(am__objects_1) libgtkhwrapbox_la_OBJECTS = $(am_libgtkhwrapbox_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkhwrapbox.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gtkwrapbox.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 247,255 ---- $(am__objects_1) libgtkhwrapbox_la_OBJECTS = $(am_libgtkhwrapbox_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 208,214 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libgtkhwrapbox_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libgtkhwrapbox_la_SOURCES) --- 257,262 ---- *************** *** 219,225 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cut-n-paste-code/widgets/gimphwrapbox/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 267,273 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cut-n-paste-code/widgets/gimphwrapbox/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 227,233 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 275,281 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 240,269 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkhwrapbox.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkwrapbox.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 288,301 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 278,283 **** --- 310,318 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 303,322 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 338,378 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 373,380 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 429,436 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 403,421 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 459,484 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/data/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/Makefile.in *** ./nautilus/data/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/Makefile.in Fri Dec 19 01:17:41 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = DESKTOP_IN_FILES = applications.desktop.in \ *************** *** 222,235 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(nautilusdata_DATA) $(starthere_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 277,293 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(nautilusdata_DATA) $(starthere_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 237,243 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu data/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 295,301 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps data/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 341,350 **** --- 399,415 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 375,394 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 440,480 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 488,512 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-nautilusdataDATA \ uninstall-starthereDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-local install-data-recursive install-exec \ ! install-exec-am install-exec-recursive install-info \ ! install-info-am install-info-recursive install-man \ ! install-nautilusdataDATA install-recursive \ ! install-starthereDATA install-strip installcheck \ ! installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-nautilusdataDATA \ uninstall-recursive uninstall-starthereDATA --- 574,607 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-nautilusdataDATA \ uninstall-starthereDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-local \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-nautilusdataDATA \ ! install-recursive install-starthereDATA install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-nautilusdataDATA \ uninstall-recursive uninstall-starthereDATA diff -crN ./nautilus/data/patterns/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/patterns/Makefile.in *** ./nautilus/data/patterns/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/patterns/Makefile.in Fri Dec 19 01:17:41 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = backdir = $(datadir)/nautilus/patterns *************** *** 211,216 **** --- 266,273 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(back_DATA) *************** *** 220,226 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu data/patterns/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 277,283 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps data/patterns/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 254,266 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 311,332 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 345,350 **** --- 411,424 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-backDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 354,361 **** install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-backDATA \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 428,435 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-backDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/docs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/docs/Makefile.in *** ./nautilus/docs/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/docs/Makefile.in Fri Dec 19 01:17:42 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = EXTRA_DIST = \ *************** *** 187,192 **** --- 242,249 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am *************** *** 194,200 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu docs/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 251,257 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps docs/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 210,222 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 267,288 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 300,305 **** --- 366,379 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 309,315 **** install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 383,390 ---- install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/Makefile.in *** ./nautilus/icons/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/Makefile.in Fri Dec 19 01:17:43 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = \ *************** *** 206,219 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(icon_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 261,277 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(icon_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 221,227 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 279,285 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 307,316 **** --- 365,381 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 341,360 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 406,446 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 453,477 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-iconDATA uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-iconDATA install-info \ ! install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-iconDATA uninstall-info-am \ ! uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 539,572 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-iconDATA uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-iconDATA install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-iconDATA \ ! uninstall-info-am uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/crux_eggplant/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/crux_eggplant/Makefile.in *** ./nautilus/icons/crux_eggplant/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/crux_eggplant/Makefile.in Fri Dec 19 01:17:43 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ crux_eggplantdir = $(datadir)/pixmaps/nautilus/crux_eggplant crux_eggplant_DATA = \ *************** *** 178,183 **** --- 233,240 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(crux_eggplant_DATA) *************** *** 187,193 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/crux_eggplant/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 244,250 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/crux_eggplant/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 221,233 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 278,299 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 312,317 **** --- 378,391 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-crux_eggplantDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 321,328 **** install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ ! uninstall-am uninstall-crux_eggplantDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 395,403 ---- install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ! ps ps-am uninstall uninstall-am uninstall-crux_eggplantDATA \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/crux_teal/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/crux_teal/Makefile.in *** ./nautilus/icons/crux_teal/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/crux_teal/Makefile.in Fri Dec 19 01:17:44 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ crux_tealdir = $(datadir)/pixmaps/nautilus/crux_teal crux_teal_DATA = \ *************** *** 178,183 **** --- 233,240 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(crux_teal_DATA) *************** *** 187,193 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/crux_teal/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 244,250 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/crux_teal/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 221,233 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 278,299 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 312,317 **** --- 378,391 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-crux_tealDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 321,327 **** install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am \ uninstall-crux_tealDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 395,401 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-crux_tealDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -crN ./nautilus/icons/default/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/default/Makefile.in *** ./nautilus/icons/default/Makefile.in Mon Sep 8 22:02:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/default/Makefile.in Fri Dec 19 01:17:44 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = icondir = $(datadir)/pixmaps/nautilus/default *************** *** 182,187 **** --- 237,244 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(icon_DATA) *************** *** 191,197 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/default/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 248,254 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/default/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 225,237 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 282,303 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 316,321 **** --- 382,395 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-iconDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 325,332 **** install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-iconDATA \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 399,406 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-iconDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/gnome/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/gnome/Makefile.in *** ./nautilus/icons/gnome/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/gnome/Makefile.in Fri Dec 19 01:17:45 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = gnomedir = $(datadir)/pixmaps/nautilus/gnome *************** *** 181,186 **** --- 236,243 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(gnome_DATA) *************** *** 190,196 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/gnome/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 247,253 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/gnome/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 224,236 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 281,302 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 315,320 **** --- 381,394 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-gnomeDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 324,331 **** install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-gnomeDATA \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 398,405 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-gnomeDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/sierra/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/sierra/Makefile.in *** ./nautilus/icons/sierra/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/sierra/Makefile.in Fri Dec 19 01:17:46 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ sierradir = $(datadir)/pixmaps/nautilus/sierra sierra_DATA = \ *************** *** 178,183 **** --- 233,240 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(sierra_DATA) *************** *** 187,193 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/sierra/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 244,250 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/sierra/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 221,233 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 278,299 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 312,317 **** --- 378,391 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-sierraDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 321,328 **** install-info-am install-man install-sierraDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-sierraDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 395,402 ---- install-info-am install-man install-sierraDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-sierraDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/icons/tahoe/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/tahoe/Makefile.in *** ./nautilus/icons/tahoe/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/icons/tahoe/Makefile.in Fri Dec 19 01:17:46 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = tahoedir = $(datadir)/pixmaps/nautilus/tahoe *************** *** 181,186 **** --- 236,243 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(tahoe_DATA) *************** *** 190,196 **** .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu icons/tahoe/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 247,253 ---- .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps icons/tahoe/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 224,236 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 281,302 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 315,320 **** --- 381,394 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-tahoeDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 324,331 **** install-info-am install-man install-strip install-tahoeDATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-tahoeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 398,405 ---- install-info-am install-man install-strip install-tahoeDATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-tahoeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/install-sh *** ./nautilus/install-sh Mon Jan 27 12:03:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/install-sh Fri Dec 19 01:17:25 2003 *************** *** 109,115 **** echo "install: no input file specified" exit 1 else ! : fi if [ x"$dir_arg" != x ]; then --- 109,115 ---- echo "install: no input file specified" exit 1 else ! true fi if [ x"$dir_arg" != x ]; then *************** *** 120,126 **** instcmd=: chmodcmd="" else ! instcmd=$mkdirprog fi else --- 120,126 ---- instcmd=: chmodcmd="" else ! instcmd=mkdir fi else *************** *** 128,136 **** # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. ! if [ -f "$src" ] || [ -d "$src" ] then ! : else echo "install: $src does not exist" exit 1 --- 128,136 ---- # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. ! if [ -f $src -o -d $src ] then ! true else echo "install: $src does not exist" exit 1 *************** *** 141,147 **** echo "install: no destination specified" exit 1 else ! : fi # If destination is a directory, append the input filename; if your system --- 141,147 ---- echo "install: no destination specified" exit 1 else ! true fi # If destination is a directory, append the input filename; if your system *************** *** 151,157 **** then dst="$dst"/`basename $src` else ! : fi fi --- 151,157 ---- then dst="$dst"/`basename $src` else ! true fi fi *************** *** 163,170 **** # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" --- 163,170 ---- # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" *************** *** 183,189 **** then $mkdirprog "${pathcomp}" else ! : fi pathcomp="${pathcomp}/" --- 183,189 ---- then $mkdirprog "${pathcomp}" else ! true fi pathcomp="${pathcomp}/" *************** *** 194,203 **** then $doit $instcmd $dst && ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. --- 194,203 ---- then $doit $instcmd $dst && ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst || true; else true ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else # If we're going to rename the final executable, determine the name now. *************** *** 216,222 **** then dstfile=`basename $dst` else ! : fi # Make a temp file name in the proper directory. --- 216,222 ---- then dstfile=`basename $dst` else ! true fi # Make a temp file name in the proper directory. *************** *** 235,244 **** # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. --- 235,244 ---- # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp || true; else true;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. diff -crN ./nautilus/intltool-extract.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-extract.in *** ./nautilus/intltool-extract.in Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-extract.in Fri Dec 19 01:16:14 2003 *************** *** 32,38 **** ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.1"; ## Loaded modules use strict; --- 32,38 ---- ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; diff -crN ./nautilus/intltool-merge.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-merge.in *** ./nautilus/intltool-merge.in Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-merge.in Fri Dec 19 01:16:14 2003 *************** *** 34,40 **** ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.1"; ## Loaded modules use strict; --- 34,40 ---- ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; *************** *** 239,245 **** sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) --- 239,245 ---- sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/freeware/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) diff -crN ./nautilus/intltool-update.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-update.in *** ./nautilus/intltool-update.in Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/intltool-update.in Fri Dec 19 01:16:15 2003 *************** *** 29,35 **** ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.27.1"; my $PACKAGE = "intltool"; ## Loaded modules --- 29,35 ---- ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.27.2"; my $PACKAGE = "intltool"; ## Loaded modules diff -crN ./nautilus/libbackground/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libbackground/Makefile.in *** ./nautilus/libbackground/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libbackground/Makefile.in Fri Dec 19 01:17:47 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ EXTRA_DIST = ChangeLog INCLUDES = \ *************** *** 195,210 **** preview-file-selection.lo libbackground_la_OBJECTS = $(am_libbackground_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/applier.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/preferences.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/preview-file-selection.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 250,258 ---- preview-file-selection.lo libbackground_la_OBJECTS = $(am_libbackground_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 212,218 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libbackground_la_SOURCES) DIST_COMMON = ChangeLog Makefile.am Makefile.in SOURCES = $(libbackground_la_SOURCES) --- 260,265 ---- *************** *** 223,229 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libbackground/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 270,276 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libbackground/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 231,237 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 278,284 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 244,274 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applier.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preview-file-selection.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 291,304 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 283,288 **** --- 313,321 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 308,327 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 341,381 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 378,385 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 432,439 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 408,426 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 462,487 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./nautilus/libnautilus-adapter/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-adapter/Makefile.in *** ./nautilus/libnautilus-adapter/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-adapter/Makefile.in Fri Dec 19 01:17:48 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = lib_LTLIBRARIES = libnautilus-adapter.la *************** *** 222,237 **** am_libnautilus_adapter_la_OBJECTS = $(am__objects_1) $(am__objects_2) libnautilus_adapter_la_OBJECTS = $(am_libnautilus_adapter_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-adapter-factory-common.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-factory-skels.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-adapter-factory-stubs.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 277,285 ---- am_libnautilus_adapter_la_OBJECTS = $(am__objects_1) $(am__objects_2) libnautilus_adapter_la_OBJECTS = $(am_libnautilus_adapter_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 239,245 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_adapter_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libnautilus_adapter_la_SOURCES) --- 287,292 ---- *************** *** 251,257 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libnautilus-adapter/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) --- 298,304 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libnautilus-adapter/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 278,284 **** -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 325,331 ---- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 291,321 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-factory-common.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-factory-skels.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-adapter-factory-stubs.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 338,351 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 330,335 **** --- 360,368 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 355,374 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 388,428 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 389,395 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am --- 443,449 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am *************** *** 431,438 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 485,492 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 461,479 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-info-am uninstall-libLTLIBRARIES $(nautilus_adapter_factory_idl_sources): nautilus_adapter_factory_idl_stamp --- 515,542 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-info-am \ ! uninstall-libLTLIBRARIES $(nautilus_adapter_factory_idl_sources): nautilus_adapter_factory_idl_stamp diff -crN ./nautilus/libnautilus-private/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/Makefile.in *** ./nautilus/libnautilus-private/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/Makefile.in Fri Dec 19 01:17:49 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = lib_LTLIBRARIES = libnautilus-private.la *************** *** 422,500 **** nautilus-volume-monitor.lo $(am__objects_1) libnautilus_private_la_OBJECTS = $(am_libnautilus_private_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-audio-player.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-bonobo-extensions.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-bookmark.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-customization-data.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-default-file-icon.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-directory-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-directory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-icon-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-link-monitor.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-link.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-directory-async.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-directory-background.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-directory-metafile-monitor.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-directory-metafile.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-directory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-dnd.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-drag-window.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-emblem-utils.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-entry.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-changes-queue.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-dnd.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-operations-progress.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-operations.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-queue.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-utilities.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-global-preferences.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-horizontal-splitter.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-icon-canvas-item.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-icon-container.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-icon-dnd.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-icon-factory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-keep-last-vertical-box.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-lib-self-check-functions.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-link-desktop-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-link-historical.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-link.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-marshal.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-medusa-support.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-merged-directory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-metafile-factory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-metafile-server-common.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-metafile-server-skels.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-metafile-server-stubs.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-metafile.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-mime-actions.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-monitor.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-program-chooser.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-program-choosing.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-recent.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-search-uri.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-sidebar-functions.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-sound.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-theme.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-thumbnails.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-trash-directory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-trash-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-trash-monitor.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-tree-view-drag-dest.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-undo-context.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-undo-manager.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-undo-signal-handlers.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-vfs-directory.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-vfs-file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-identifier.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-volume-monitor.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 477,485 ---- nautilus-volume-monitor.lo $(am__objects_1) libnautilus_private_la_OBJECTS = $(am_libnautilus_private_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 502,512 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_private_la_SOURCES) DATA = $(fsattributes_DATA) $(schema_DATA) ! DIST_COMMON = README Makefile.am Makefile.in SOURCES = $(libnautilus_private_la_SOURCES) all: all-am --- 487,497 ---- CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libnautilus_private_la_SOURCES) DATA = $(fsattributes_DATA) $(schema_DATA) ! DIST_COMMON = README $(top_srcdir)/Makefile.shared Makefile.am \ ! Makefile.in SOURCES = $(libnautilus_private_la_SOURCES) all: all-am *************** *** 515,521 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libnautilus-private/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) --- 500,506 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libnautilus-private/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) *************** *** 542,548 **** -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 527,533 ---- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 555,648 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-audio-player.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-bonobo-extensions.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-bookmark.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-customization-data.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-default-file-icon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-directory-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-directory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-icon-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-link-monitor.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-link.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-directory-async.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-directory-background.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-directory-metafile-monitor.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-directory-metafile.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-directory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-dnd.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-drag-window.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-emblem-utils.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-entry.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-changes-queue.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-dnd.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-operations-progress.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-operations.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-queue.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-utilities.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-global-preferences.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-horizontal-splitter.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-icon-canvas-item.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-icon-container.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-icon-dnd.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-icon-factory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-keep-last-vertical-box.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-lib-self-check-functions.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-link-desktop-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-link-historical.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-link.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-marshal.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-medusa-support.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-merged-directory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-metafile-factory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-metafile-server-common.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-metafile-server-skels.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-metafile-server-stubs.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-metafile.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-mime-actions.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-monitor.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-program-chooser.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-program-choosing.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-recent.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-search-uri.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-sidebar-functions.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-sound.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-theme.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-thumbnails.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-trash-directory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-trash-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-trash-monitor.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-tree-view-drag-dest.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-undo-context.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-undo-manager.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-undo-signal-handlers.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-vfs-directory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-vfs-file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-identifier.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-volume-monitor.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 540,553 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 693,698 **** --- 598,606 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 718,737 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 626,667 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/.. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 752,758 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am --- 682,688 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am *************** *** 793,800 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 723,730 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 824,835 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-fsattributesDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-schemaDATA ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-data-local \ install-exec install-exec-am install-fsattributesDATA \ --- 754,773 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-fsattributesDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-schemaDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-data-local \ install-exec install-exec-am install-fsattributesDATA \ *************** *** 837,844 **** install-schemaDATA install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-fsattributesDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-schemaDATA --- 775,782 ---- install-schemaDATA install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-fsattributesDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-schemaDATA diff -crN ./nautilus/libnautilus/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus/Makefile.in *** ./nautilus/libnautilus/Makefile.in Mon Sep 8 22:02:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus/Makefile.in Fri Dec 19 01:17:50 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = lib_LTLIBRARIES = libnautilus.la *************** *** 186,191 **** --- 241,248 ---- $(NULL) + libnautilus_la_LIBADD = @ALL_LIBS@ + nautilus_view_component_idl_sources = \ nautilus-view-component-stubs.c \ nautilus-view-component-skels.c \ *************** *** 273,279 **** CONFIG_CLEAN_FILES = libnautilus.pc LTLIBRARIES = $(lib_LTLIBRARIES) ! libnautilus_la_LIBADD = am__objects_1 = nautilus-view-component-stubs.lo \ nautilus-view-component-skels.lo \ nautilus-view-component-common.lo --- 330,336 ---- CONFIG_CLEAN_FILES = libnautilus.pc LTLIBRARIES = $(lib_LTLIBRARIES) ! libnautilus_la_DEPENDENCIES = am__objects_1 = nautilus-view-component-stubs.lo \ nautilus-view-component-skels.lo \ nautilus-view-component-common.lo *************** *** 288,313 **** nautilus-view-standard-main.lo $(am__objects_3) libnautilus_la_OBJECTS = $(am_libnautilus_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-clipboard.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-distributed-undo-common.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-distributed-undo-skels.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-distributed-undo-stubs.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-idle-queue.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-scroll-positionable.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-undo-transaction.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-undo.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-component-common.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-component-skels.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-component-stubs.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-standard-main.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 345,353 ---- nautilus-view-standard-main.lo $(am__objects_3) libnautilus_la_OBJECTS = $(am_libnautilus_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 315,328 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_la_SOURCES) DATA = $(idl_DATA) $(pkgconfig_DATA) $(ui_DATA) HEADERS = $(libnautilusinclude_HEADERS) ! DIST_COMMON = README $(libnautilusinclude_HEADERS) Makefile.am \ ! Makefile.in libnautilus.pc.in SOURCES = $(libnautilus_la_SOURCES) all: $(BUILT_SOURCES) --- 355,368 ---- CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libnautilus_la_SOURCES) DATA = $(idl_DATA) $(pkgconfig_DATA) $(ui_DATA) HEADERS = $(libnautilusinclude_HEADERS) ! DIST_COMMON = README $(libnautilusinclude_HEADERS) \ ! $(top_srcdir)/Makefile.shared Makefile.am Makefile.in \ ! libnautilus.pc.in SOURCES = $(libnautilus_la_SOURCES) all: $(BUILT_SOURCES) *************** *** 332,338 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libnautilus/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libnautilus.pc: $(top_builddir)/config.status libnautilus.pc.in --- 372,378 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libnautilus/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libnautilus.pc: $(top_builddir)/config.status libnautilus.pc.in *************** *** 361,367 **** -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 401,407 ---- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 374,414 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-clipboard.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-distributed-undo-common.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-distributed-undo-skels.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-distributed-undo-stubs.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-idle-queue.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-scroll-positionable.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-undo-transaction.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-undo.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-component-common.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-component-skels.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-component-stubs.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-standard-main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 414,427 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 495,500 **** --- 508,516 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 520,539 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 536,577 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/.. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 554,560 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am --- 592,598 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am *************** *** 596,603 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 634,641 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 627,639 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-idlDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-libnautilusincludeHEADERS \ uninstall-pkgconfigDATA uninstall-uiDATA ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-idlDATA install-info install-info-am \ --- 665,685 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-idlDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-libnautilusincludeHEADERS \ uninstall-pkgconfigDATA uninstall-uiDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-idlDATA install-info install-info-am \ *************** *** 641,648 **** install-man install-pkgconfigDATA install-strip install-uiDATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-idlDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-libnautilusincludeHEADERS \ uninstall-pkgconfigDATA uninstall-uiDATA --- 687,694 ---- install-man install-pkgconfigDATA install-strip install-uiDATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-idlDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-libnautilusincludeHEADERS \ uninstall-pkgconfigDATA uninstall-uiDATA diff -crN ./nautilus/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/ltmain.sh *** ./nautilus/ltmain.sh Mon Sep 8 22:02:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/ltmain.sh Fri Dec 19 01:16:14 2003 *************** *** 48,65 **** exit 0 fi - # define SED for historic ltconfig's generated by Libtool 1.3 - test -z "$SED" && SED=sed - # The name of this program. ! progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.3 ! TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" default_mode= help="Try \`$progname --help' for more information." --- 48,62 ---- exit 0 fi # The name of this program. ! progname=`$echo "$0" | sed 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.2 ! TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" default_mode= help="Try \`$progname --help' for more information." *************** *** 70,88 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! # test EBCDIC or ASCII ! case `echo A|od -x` in ! *[Cc]1*) # EBCDIC based system ! SP2NL="tr '\100' '\n'" ! NL2SP="tr '\r\n' '\100\100'" ! ;; ! *) # Assume ASCII based system ! SP2NL="tr '\040' '\012'" ! NL2SP="tr '\015\012' '\040\040'" ! ;; ! esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. --- 67,76 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! SP2NL='tr \040 \012' ! NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. *************** *** 156,162 **** ;; --config) ! ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; --- 144,150 ---- ;; --config) ! sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; *************** *** 189,196 **** --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --preserve-dup-deps) duplicate_deps="yes" ;; - --quiet | --silent) show=: ;; --- 177,182 ---- *************** *** 229,235 **** # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc* | xlc*) mode=link for arg do --- 215,221 ---- # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc*) mode=link for arg do *************** *** 481,487 **** pic_mode=default ;; esac ! if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi --- 467,473 ---- pic_mode=default ;; esac ! if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi *************** *** 771,777 **** linker_flags= dllsearchpath= lib_search_path=`pwd` - inst_prefix_dir= avoid_version=no dlfiles= --- 757,762 ---- *************** *** 902,912 **** prev= continue ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; release) release="-$arg" prev= --- 887,892 ---- *************** *** 1008,1023 **** continue ;; - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix* | no/*-*-nonstopux*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; --- 988,998 ---- continue ;; # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; *************** *** 1068,1081 **** # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; ! *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; esac elif test "X$arg" = "X-lc_r"; then case $host in ! *-*-openbsd* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; --- 1043,1056 ---- # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; ! *-*-openbsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; esac elif test "X$arg" = "X-lc_r"; then case $host in ! *-*-openbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; *************** *** 1355,1365 **** # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi libs="$libs $deplib" done deplibs= --- 1330,1338 ---- # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac libs="$libs $deplib" done deplibs= *************** *** 1488,1499 **** lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because the file extensions .$libext of this argument makes me believe" ! echo "*** that it is just a static archive that I should not used here." else echo echo "*** Warning: Linking the shared library $output against the" --- 1461,1470 ---- lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: This library needs some functionality provided by $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." else echo echo "*** Warning: Linking the shared library $output against the" *************** *** 1537,1543 **** fi # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 1508,1514 ---- fi # Check to see that this really is a libtool archive. ! if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 1584,1594 **** tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then --- 1555,1563 ---- tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then *************** *** 1711,1721 **** # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done # for deplib continue --- 1680,1688 ---- # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done # for deplib continue *************** *** 1799,1806 **** # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | ${SED} -e 's/^.*\///'` ! newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : --- 1766,1773 ---- # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | sed -e 's/^.*\///'` ! newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : *************** *** 1907,1922 **** if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in --- 1874,1880 ---- if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! add_dir="-L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *************** *** 1926,1941 **** add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" fi --- 1884,1890 ---- add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! add_dir="-L$libdir" add="-l$name" fi *************** *** 1977,1990 **** # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This system can not link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! echo "*** But as you try to build a module library, libtool will still create " ! echo "*** a static module, that should work as long as the dlopening application" ! echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" --- 1926,1938 ---- # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This library needs some functionality provided by $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! echo "*** Therefore, libtool will create a static module, that should work " ! echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" *************** *** 2033,2043 **** tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done --- 1981,1989 ---- tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done *************** *** 2063,2069 **** if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 2009,2015 ---- if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 2268,2274 **** # Check that each of the things are valid numbers. case $current in ! [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2214,2220 ---- # Check that each of the things are valid numbers. case $current in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2277,2283 **** esac case $revision in ! [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2223,2229 ---- esac case $revision in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2286,2292 **** esac case $age in ! [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2232,2238 ---- esac case $age in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2327,2347 **** versuffix=".$current"; ;; ! irix | nonstopux) major=`expr $current - $age + 1` ! ! case $version_type in ! nonstopux) verstring_prefix=nonstopux ;; ! *) verstring_prefix=sgi ;; ! esac ! verstring="$verstring_prefix$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="$verstring_prefix$major.$iface:$verstring" done # Before this point, $major must not contain `.'. --- 2273,2288 ---- versuffix=".$current"; ;; ! irix) major=`expr $current - $age + 1` ! verstring="sgi$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="sgi$major.$iface:$verstring" done # Before this point, $major must not contain `.'. *************** *** 2355,2361 **** ;; osf) ! major=.`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" --- 2296,2302 ---- ;; osf) ! major=`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" *************** *** 2447,2455 **** # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then --- 2388,2396 ---- # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` done if test -n "$xrpath"; then *************** *** 2500,2506 **** *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; ! *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; *) --- 2441,2447 ---- *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; ! *-*-openbsd*) # Do not include libc due to us having libc/libc_r. ;; *) *************** *** 2561,2580 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which I believe you do not have" ! echo "*** because a test_compile did reveal that the linker did not use it for" ! echo "*** its dynamic dependency list that programs get resolved with at runtime." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage ! # the situation: Compile a separate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. --- 2502,2519 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage the situation: ! # Compile a seperate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. *************** *** 2593,2604 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because a test_compile did reveal that the linker did not use this one" ! echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi else droppeddeps=yes --- 2532,2541 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else droppeddeps=yes *************** *** 2637,2650 **** # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2574,2587 ---- # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | sed 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2655,2671 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for file magic test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a file magic. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2592,2601 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2684,2692 **** for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check below in file_magic test if eval echo \"$potent_lib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2614,2621 ---- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do if eval echo \"$potent_lib\" 2>/dev/null \ ! | sed 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2697,2713 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for regex pattern test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a regex pattern. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2626,2635 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2972,2989 **** if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else - save_deplibs="$deplibs" - for conv in $convenience; do - tmp_deplibs= - for test_deplib in $deplibs; do - if test "$test_deplib" != "$conv"; then - tmp_deplibs="$tmp_deplibs $test_deplib" - fi - done - deplibs="$tmp_deplibs" - done eval cmds=\"$archive_cmds\" - deplibs="$save_deplibs" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do --- 2894,2900 ---- *************** *** 3182,3188 **** prog) case $host in ! *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 --- 3093,3099 ---- prog) case $host in ! *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 *************** *** 3204,3219 **** # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac ;; esac compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" --- 3115,3128 ---- # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; esac + # AIX needs explicit runtime linking option + + compile_command="$compile_command $use_runtimelinking" + finalize_command="$finalize_command $use_runtimelinking" + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" *************** *** 3377,3385 **** if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi --- 3286,3294 ---- if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi *************** *** 3387,3393 **** for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | ${SED} -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done --- 3296,3302 ---- for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | sed -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done *************** *** 3402,3414 **** fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | ! if sort -k 3 /dev/null 2>&1; then ! sort -k 3 ! else ! sort +2 ! fi | ! uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S --- 3311,3317 ---- fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S *************** *** 3630,3636 **** relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="(cd `pwd`; $relink_command)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi --- 3533,3539 ---- relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="cd `pwd`; $relink_command" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi *************** *** 3650,3656 **** # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in --- 3553,3559 ---- # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|sed 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in *************** *** 3674,3680 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout --- 3577,3583 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout *************** *** 3712,3718 **** test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` --- 3615,3621 ---- test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` *************** *** 3725,3731 **** fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done # Try to get the absolute directory name. --- 3628,3634 ---- fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` done # Try to get the absolute directory name. *************** *** 3739,3745 **** progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" --- 3642,3648 ---- progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" *************** *** 3785,3791 **** $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 ${SED} $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var --- 3688,3694 ---- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 sed $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var *************** *** 3960,3966 **** fi done # Quote the link command for shipping. ! relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. --- 3863,3869 ---- fi done # Quote the link command for shipping. ! relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. *************** *** 3977,3983 **** case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 3880,3886 ---- case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 3991,3997 **** newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3894,3900 ---- newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 4002,4008 **** newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3905,3911 ---- newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 4016,4021 **** --- 3919,3925 ---- tdlname=$dlname case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *aix*,*,*,*,*) tdlname=$realname\($dlname\) ;; esac $echo > $output "\ # $outputname - a libtool library file *************** *** 4226,4232 **** *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4130,4136 ---- *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4260,4292 **** test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! if test -n "$relink_command"; then ! # Determine the prefix the user has applied to our future dir. ! inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` ! ! # Don't allow the user to place us outside of our expected ! # location b/c this prevents finding dependent libraries that ! # are installed to the same prefix. ! if test "$inst_prefix_dir" = "$destdir"; then ! $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 ! exit 1 ! fi ! ! if test -n "$inst_prefix_dir"; then ! # Stick the inst_prefix_dir data into the link command. ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ! else ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` ! fi ! ! $echo "$modename: warning: relinking \`$file'" 1>&2 ! $show "$relink_command" ! if $run eval "$relink_command"; then : ! else ! $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ! exit 1 ! fi ! fi # See the names of the shared library. set dummy $library_names --- 4164,4180 ---- test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! # BEGIN WORKAROUND DESTDIR ! # if test -n "$relink_command"; then ! # $echo "$modename: warning: relinking \`$file'" 1>&2 ! # $show "$relink_command" ! # if $run eval "$relink_command"; then : ! # else ! # $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ! # continue ! # fi ! # fi ! # END WORKAROUND DESTDIR # See the names of the shared library. set dummy $library_names *************** *** 4296,4302 **** shift srcname="$realname" ! test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" --- 4184,4192 ---- shift srcname="$realname" ! # BEGIN WORKAROUND DESTDIR ! # test -n "$relink_command" && srcname="$realname"T ! # END WORKAROUND DESTDIR # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" *************** *** 4393,4419 **** fi # Do a test to see if this is really a libtool program. ! case $host in ! *cygwin*|*mingw*) ! wrapper=`echo $file | ${SED} -e 's,.exe$,,'` ! ;; ! *) ! wrapper=$file ! ;; ! esac ! if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 exit 1 fi --- 4283,4301 ---- fi # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 exit 1 fi *************** *** 4438,4445 **** relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac outputname= --- 4320,4327 ---- relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac outputname= *************** *** 4447,4459 **** if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` ! if test $? = 0 ; then ! tmpdir="$tmpdir_mktemp" ! unset tmpdir_mktemp ! else ! tmpdir="$tmpdir/libtool-$$" ! fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 --- 4329,4335 ---- if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir="$tmpdir/libtool-$$" if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 *************** *** 4493,4499 **** destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` ;; esac ;; --- 4369,4375 ---- destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | sed -e 's,.exe$,,'` ;; esac ;; *************** *** 4641,4647 **** case $file in *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4517,4523 ---- case $file in *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4712,4718 **** -*) ;; *) # Do a test to see if this is really a libtool program. ! if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; --- 4588,4594 ---- -*) ;; *) # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; *************** *** 4744,4750 **** fi # Now prepare to actually exec the command. ! exec_cmd="\$cmd$args" else # Display what would be done. if test -n "$shlibpath_var"; then --- 4620,4626 ---- fi # Now prepare to actually exec the command. ! exec_cmd='"$cmd"$args' else # Display what would be done. if test -n "$shlibpath_var"; then *************** *** 4821,4827 **** case $name in *.la) # Possibly a libtool archive, so verify it. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. --- 4697,4703 ---- case $name in *.la) # Possibly a libtool archive, so verify it. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. *************** *** 4876,4882 **** *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file --- 4752,4758 ---- *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file diff -crN ./nautilus/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/mkinstalldirs *** ./nautilus/mkinstalldirs Mon Jan 27 12:03:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/mkinstalldirs Fri Dec 19 01:17:25 2003 *************** *** 12,29 **** # process command line arguments while test $# -gt 0 ; do ! case "${1}" in ! -h | --help | --h* ) # -h for help ! echo "${usage}" 1>&2; exit 0 ;; ! -m ) # -m PERM arg ! shift ! test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ! dirmode="${1}" ! shift ;; ! -- ) shift; break ;; # stop option processing ! -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option ! * ) break ;; # first non-opt arg ! esac done for file --- 12,40 ---- # process command line arguments while test $# -gt 0 ; do ! case $1 in ! -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ! ;; ! -m) # -m PERM arg ! shift ! test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ! dirmode=$1 ! shift ! ;; ! --) # stop option processing ! shift ! break ! ;; ! -*) # unknown option ! echo "$usage" 1>&2 ! exit 1 ! ;; ! *) # first non-opt arg ! break ! ;; ! esac done for file *************** *** 36,99 **** done case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case "$pathcomp" in ! -* ) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus # Local Variables: # mode: shell-script ! # sh-indentation: 3 # End: # mkinstalldirs ends here --- 47,111 ---- done case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ! ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ! ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case $pathcomp in ! -*) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus # Local Variables: # mode: shell-script ! # sh-indentation: 2 # End: # mkinstalldirs ends here diff -crN ./nautilus/src/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/Makefile.in *** ./nautilus/src/Makefile.in Mon Sep 8 22:02:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/Makefile.in Fri Dec 19 01:17:51 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = SUBDIRS = file-manager *************** *** 422,472 **** $(top_builddir)/cut-n-paste-code/gsequence/libgsequence.la nautilus_server_connect_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nautilus-applicable-views.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-application.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-bookmark-list.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-bookmark-parsing.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-bookmarks-window.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-complex-search-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-component-adapter-factory.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-desktop-window.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-management-properties-main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-file-management-properties.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-first-time-druid.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-information-panel.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-location-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-navigation-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-profiler.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-property-browser.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-search-bar-criterion.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-search-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-self-check-functions.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-server-connect.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-shell-interface-common.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-shell-interface-skels.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-shell-interface-stubs.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-shell.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-side-pane.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-sidebar-title.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-signaller.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-simple-search-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-switchable-navigation-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-switchable-search-bar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-frame-corba.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-view-frame.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-window-manage-views.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-window-menus.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-window-toolbars.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-window.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-zoom-control.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 477,485 ---- $(top_builddir)/cut-n-paste-code/gsequence/libgsequence.la nautilus_server_connect_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 474,480 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(nautilus_SOURCES) \ $(nautilus_file_management_properties_SOURCES) \ $(nautilus_server_connect_SOURCES) --- 487,492 ---- *************** *** 482,492 **** $(ui_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_SOURCES) $(nautilus_file_management_properties_SOURCES) $(nautilus_server_connect_SOURCES) --- 494,505 ---- $(ui_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = $(top_srcdir)/Makefile.shared Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(nautilus_SOURCES) $(nautilus_file_management_properties_SOURCES) $(nautilus_server_connect_SOURCES) *************** *** 497,503 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 510,516 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 511,517 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 524,530 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 545,610 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-applicable-views.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-application.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-bookmark-list.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-bookmark-parsing.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-bookmarks-window.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-complex-search-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-component-adapter-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-desktop-window.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-management-properties-main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-file-management-properties.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-first-time-druid.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-information-panel.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-location-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-navigation-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-profiler.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-property-browser.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-search-bar-criterion.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-search-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-self-check-functions.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-server-connect.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-shell-interface-common.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-shell-interface-skels.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-shell-interface-stubs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-shell.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-side-pane.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-sidebar-title.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-signaller.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-simple-search-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-switchable-navigation-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-switchable-search-bar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-frame-corba.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-view-frame.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-window-manage-views.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-window-menus.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-window-toolbars.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-window.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-zoom-control.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 558,571 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 760,769 **** --- 721,737 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 794,809 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH check-TESTS: $(TESTS) ! @failed=0; all=0; xfail=0; xpass=0; \ srcdir=$(srcdir); export srcdir; \ list='$(TESTS)'; \ if test -n "$$list"; then \ --- 762,792 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) ! @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list='$(TESTS)'; \ if test -n "$$list"; then \ *************** *** 835,840 **** --- 818,826 ---- echo "FAIL: $$tst"; \ ;; \ esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ fi; \ done; \ if test "$$failed" -eq 0; then \ *************** *** 850,858 **** banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ fi; \ fi; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi --- 836,859 ---- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ fi; \ fi; \ ! dashes="$$banner"; \ ! skipped=""; \ ! if test "$$skip" -ne 0; then \ ! skipped="($$skip tests were not run)"; \ ! test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ! dashes="$$skipped"; \ ! fi; \ ! report=""; \ ! if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ ! report="Please report to $(PACKAGE_BUGREPORT)"; \ ! test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ! dashes="$$report"; \ ! fi; \ ! dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ + test -n "$$skipped" && echo "$$skipped"; \ + test -n "$$report" && echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi *************** *** 862,868 **** distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 863,876 ---- distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/.. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 896,902 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS --- 904,910 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS *************** *** 938,945 **** distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-recursive --- 946,953 ---- distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive *************** *** 969,999 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ uninstall-gladeDATA uninstall-info-am uninstall-schemeDATA \ uninstall-serverDATA uninstall-uiDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-TESTS check-am \ ! clean clean-binPROGRAMS clean-generic clean-libtool \ ! clean-recursive distclean distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-binPROGRAMS \ ! install-data install-data-am install-data-recursive \ ! install-desktopDATA install-exec install-exec-am \ ! install-exec-recursive install-gladeDATA install-info \ ! install-info-am install-info-recursive install-man \ install-recursive install-schemeDATA install-serverDATA \ install-strip install-uiDATA installcheck installcheck-am \ installdirs installdirs-am installdirs-recursive \ maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! tags tags-recursive uninstall uninstall-am \ ! uninstall-binPROGRAMS uninstall-desktopDATA uninstall-gladeDATA \ ! uninstall-info-am uninstall-info-recursive uninstall-recursive \ uninstall-schemeDATA uninstall-serverDATA uninstall-uiDATA --- 977,1016 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ uninstall-gladeDATA uninstall-info-am uninstall-schemeDATA \ uninstall-serverDATA uninstall-uiDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ ! check-am clean clean-binPROGRAMS clean-generic clean-libtool \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-binPROGRAMS install-data install-data-am \ ! install-data-recursive install-desktopDATA install-exec \ ! install-exec-am install-exec-recursive install-gladeDATA \ ! install-info install-info-am install-info-recursive install-man \ install-recursive install-schemeDATA install-serverDATA \ install-strip install-uiDATA installcheck installcheck-am \ installdirs installdirs-am installdirs-recursive \ maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-desktopDATA uninstall-gladeDATA uninstall-info-am \ ! uninstall-info-recursive uninstall-recursive \ uninstall-schemeDATA uninstall-serverDATA uninstall-uiDATA diff -crN ./nautilus/src/file-manager/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/file-manager/Makefile.in *** ./nautilus/src/file-manager/Makefile.in Mon Sep 8 22:02:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/file-manager/Makefile.in Fri Dec 19 01:17:52 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = noinst_LTLIBRARIES = libnautilus-file-manager.la *************** *** 237,259 **** libnautilus_file_manager_la_OBJECTS = \ $(am_libnautilus_file_manager_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fm-desktop-icon-view.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-directory-view.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-error-reporting.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-icon-container.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-icon-view.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-list-model.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-list-view.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-properties-window.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/fm-search-list-view.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/nautilus-indexing-info.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 292,300 ---- libnautilus_file_manager_la_OBJECTS = \ $(am_libnautilus_file_manager_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 261,271 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libnautilus_file_manager_la_SOURCES) DATA = $(ui_DATA) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libnautilus_file_manager_la_SOURCES) all: all-am --- 302,311 ---- CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libnautilus_file_manager_la_SOURCES) DATA = $(ui_DATA) ! DIST_COMMON = $(top_srcdir)/Makefile.shared Makefile.am Makefile.in SOURCES = $(libnautilus_file_manager_la_SOURCES) all: all-am *************** *** 274,280 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu src/file-manager/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 314,320 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.shared $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps src/file-manager/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 282,288 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 322,328 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 295,332 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-desktop-icon-view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-directory-view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-error-reporting.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-icon-container.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-icon-view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-list-model.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-list-view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-properties-window.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm-search-list-view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-indexing-info.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 335,348 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 359,364 **** --- 375,383 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 384,403 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 403,444 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/../.. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 455,462 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 496,503 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 485,502 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-uiDATA ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip install-uiDATA installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ uninstall-am uninstall-info-am uninstall-uiDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 526,551 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-uiDATA ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip install-uiDATA installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-info-am uninstall-uiDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -crN ./nautilus/test/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/Makefile.in *** ./nautilus/test/Makefile.in Mon Sep 8 22:02:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/Makefile.in Fri Dec 19 01:17:53 2003 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,97 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EEL_REQUIRED = @EEL_REQUIRED@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ ENABLE_PROFILER = @ENABLE_PROFILER@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 13,92 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! ALL_CFLAGS = @ALL_CFLAGS@ ! ALL_LIBS = @ALL_LIBS@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ART_REQUIRED = @ART_REQUIRED@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BONOBO_UI_REQUIRED = @BONOBO_UI_REQUIRED@ + CAPPLET_CFLAGS = @CAPPLET_CFLAGS@ + CAPPLET_LIBS = @CAPPLET_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ COMPONENT_LIBS = @COMPONENT_LIBS@ CORE_CFLAGS = @CORE_CFLAGS@ CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ CORE_LIBS = @CORE_LIBS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ EEL_REQUIRED = @EEL_REQUIRED@ + EGREP = @EGREP@ EMBLEM_COMPONENT_CFLAGS = @EMBLEM_COMPONENT_CFLAGS@ EMBLEM_COMPONENT_LIBS = @EMBLEM_COMPONENT_LIBS@ + ENABLE_HARDWARE_VIEW_FALSE = @ENABLE_HARDWARE_VIEW_FALSE@ + ENABLE_HARDWARE_VIEW_TRUE = @ENABLE_HARDWARE_VIEW_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ ESOUND_REQUIRED = @ESOUND_REQUIRED@ + EXEEXT = @EXEEXT@ GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 106,112 **** --- 101,114 ---- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ GSEQUENCE_CFLAGS = @GSEQUENCE_CFLAGS@ GTK_REQUIRED = @GTK_REQUIRED@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ HAVE_JW = @HAVE_JW@ + HAVE_JW_FALSE = @HAVE_JW_FALSE@ + HAVE_JW_TRUE = @HAVE_JW_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ *************** *** 130,150 **** INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PANGO_REQUIRED = @PANGO_REQUIRED@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ --- 132,171 ---- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ JW = @JW@ + LDFLAGS = @LDFLAGS@ LIBEGG_CFLAGS = @LIBEGG_CFLAGS@ + LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ + LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBJPEG = @LIBJPEG@ LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LSATTR_PATH = @LSATTR_PATH@ + LSDEV_PATH = @LSDEV_PATH@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MEDUSA_CFLAGS = @MEDUSA_CFLAGS@ + MEDUSA_LIBS = @MEDUSA_LIBS@ MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED = @PANGO_REQUIRED@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ *************** *** 153,171 **** --- 174,226 ---- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ RSVG_REQUIRED = @RSVG_REQUIRED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 248,265 **** $(top_builddir)/libnautilus-private/libnautilus-private.la test_nautilus_wrap_table_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test-nautilus-mime-actions-set.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/test-nautilus-mime-actions.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/test-nautilus-preferences-change.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/test-nautilus-wrap-table.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/test.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 303,311 ---- $(top_builddir)/libnautilus-private/libnautilus-private.la test_nautilus_wrap_table_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 267,273 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(test_nautilus_mime_actions_SOURCES) \ $(test_nautilus_mime_actions_set_SOURCES) \ $(test_nautilus_preferences_change_SOURCES) \ --- 313,318 ---- *************** *** 281,287 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 326,332 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 310,342 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nautilus-mime-actions-set.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nautilus-mime-actions.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nautilus-preferences-change.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nautilus-wrap-table.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 355,368 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 351,356 **** --- 377,385 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 376,395 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 405,445 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 446,453 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 496,503 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 476,493 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 526,551 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstPROGRAMS ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.