Commit ce7e34aa authored by Darin Adler's avatar Darin Adler

First baby steps at compiling under gnome 2.

parent 00ee7d7b
......@@ -25,9 +25,9 @@ obj
po
stamp-h
stamp-h.in
xml-i18n-extract
xml-i18n-extract.in
xml-i18n-merge
xml-i18n-merge.in
xml-i18n-update
xml-i18n-update.in
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
2001-10-24 Darin Adler <darin@bentspoon.com>
* Lots of files:
First baby steps at compiling under GNOME 2.
2001-10-24 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-file.c
......
include $(top_srcdir)/Makefile.shared
@XML_I18N_MERGE_DESKTOP_RULE@
@INTLTOOL_DESKTOP_RULE@
DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in
DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
......@@ -12,19 +12,22 @@ endif
SUBDIRS = \
data \
icons \
cut-n-paste-code \
libnautilus \
libnautilus-adapter \
libnautilus-private \
helper-utilities \
helper-scripts \
src \
po \
$(NULL)
XXX = \
cut-n-paste-code \
components \
helper-utilities \
helper-scripts \
$(APPLETS_SUBDIRS) \
test \
user-guide \
help \
po \
omf-install \
$(NULL)
......@@ -43,16 +46,15 @@ EXTRA_DIST= \
nautilus-launch-icon.png \
gnome-starthere-96.png \
gnome-starthere.png \
nautilusConf.sh.in \
nautilus-config.in \
ChangeLog-20000414 \
ChangeLog-20000625 \
ChangeLog-20000831 \
ChangeLog-20001018 \
xml-i18n-extract.in \
xml-i18n-merge.in \
xml-i18n-update.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
Makefile.shared \
add-include-prefix \
$(DESKTOP_IN_FILES) \
$(DESKTOP_FILES) \
$(NULL)
......
sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'
......@@ -5,7 +5,6 @@ INCLUDES =\
-DDATADIR=\""$(datadir)"\" \
-DBINDIR=\""$(bindir)"\" \
-I$(top_srcdir) \
$(APPLETS_CFLAGS) \
$(NAUTILUS_PRIVATE_CFLAGS) \
$(NULL)
......@@ -18,7 +17,6 @@ nautilus_launcher_applet_SOURCES =\
nautilus_launcher_applet_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(APPLETS_LIBS) \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
......
......@@ -5,7 +5,6 @@ INCLUDES =\
-DDATADIR=\""$(datadir)"\" \
-DBINDIR=\""$(bindir)"\" \
-I$(top_srcdir) \
$(APPLETS_CFLAGS) \
$(NAUTILUS_PRIVATE_CFLAGS) \
$(NULL)
......@@ -18,7 +17,6 @@ nautilus_preferences_applet_SOURCES =\
nautilus_preferences_applet_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(APPLETS_LIBS) \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
......
......@@ -4,104 +4,18 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
PROJECT=nautilus
TEST_TYPE=-f
FILE=src/Makefile.am
DIE=0
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
(libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool installed to compile $PROJECT."
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
PKG_NAME="nautilus"
(test -f $srcdir/configure.in \
&& test -f $srcdir/README \
&& test -d $srcdir/libnautilus) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}
(xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have xml-i18n-tools installed to compile $PROJECT."
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
if test "$DIE" -eq 1; then
exit 1
fi
test $TEST_TYPE $FILE || {
echo "You must run this script in the top-level $PROJECT directory"
exit 1
}
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
fi
case $CC in
*lcc | *lcc\ *) am_opt=--include-deps;;
esac
echo "Running gettextize... Ignore non-fatal messages."
# Hmm, we specify --force here, since otherwise things don't
# get added reliably, but we don't want to overwrite intl
# while making dist.
echo "no" | gettextize --copy --force
echo "Running xml-i18n-toolize"
xml-i18n-toolize --copy --force --automake
echo "Running libtoolize"
libtoolize --copy --force
if test -z "$GNOME_INTERFACE_VERSION"; then
ACLOCAL_FLAGS="-I hack-macros $ACLOCAL_FLAGS"
fi
aclocal $ACLOCAL_FLAGS
# optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
automake -a $am_opt
autoconf
cd $ORIGDIR
if [ "`whoami`" = "sopwith" ]; then
SOPWITH_FLAGS_HACK="--enable-fatal-warnings=no --enable-more-warnings=no"
fi
$srcdir/configure --enable-maintainer-mode "$@" $SOPWITH_FLAGS_HACK
rv=$?
if [ $rv -eq 0 ]
then
echo
echo "Now type 'make' to compile $PROJECT."
exit 0
fi
echo
echo "There was a problem running $srcdir/configure for $PROJECT."
exit 1
USE_GNOME2_MACROS=1 . gnome-autogen.sh
......@@ -7,14 +7,14 @@ INCLUDES = \
$(NAUTILUS_PRIVATE_CFLAGS) \
$(NULL)
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_ComponentAdapterFactory_std.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_ComponentAdapterFactory_std.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
bin_PROGRAMS = \
nautilus-adapter \
......@@ -54,5 +54,5 @@ nautilus_adapter_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
EXTRA_DIST = $(server_in_files) $(server_DATA)
......@@ -27,7 +27,7 @@
#include <bonobo/bonobo-stream.h>
#include <libgnomevfs/gnome-vfs.h>
BEGIN_GNOME_DECLS
G_BEGIN_DECLS
struct BonoboStreamVFS;
typedef struct BonoboStreamVFS BonoboStreamVFS;
......@@ -58,6 +58,6 @@ BonoboStream * bonobo_stream_vfs_construct (BonoboStreamVFS *stream,
BonoboStream * bonobo_stream_vfs_open (const char *uri,
Bonobo_Storage_OpenMode mode);
END_GNOME_DECLS
G_END_DECLS
#endif /* _BONOBO_STREAM_VFS_H_ */
......@@ -9,15 +9,15 @@ INCLUDES = \
$(NAUTILUS_PRIVATE_CFLAGS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_hardware.oaf.in \
server_in_files = \
Nautilus_View_hardware.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
bin_PROGRAMS = \
nautilus-hardware-view
......@@ -33,5 +33,5 @@ nautilus_hardware_view_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
EXTRA_DIST = $(server_DATA) $(server_in_files)
......@@ -40,11 +40,11 @@ modulesdir = $(libdir)/vfs/modules
libvfs_help_la_SOURCES = help-method.c help-method.h
libvfs_help_la_LDFLAGS = $(module_flags)
libvfs_help_la_LIBADD = $(GLIB_LIBS)
libvfs_help_la_LIBADD =
test_help_method_SOURCES = test-help-method.c
test_help_method_LIBASS = $(GLIB_LIBS)
test_help_method_LDADD =
modulesconfdir=$(sysconfdir)/vfs/modules
......@@ -53,13 +53,13 @@ modulesconf_DATA = help-methods.conf
hyperboladir=$(datadir)/nautilus/components/hyperbola
hyperbola_DATA=topleveldocs.xml
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_View_help.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_View_help.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) help-methods.conf topleveldocs.xml
EXTRA_DIST=pages.map $(server_in_files) $(server_DATA) help-methods.conf topleveldocs.xml
2001-10-24 Darin Adler <darin@bentspoon.com>
reviewed by: <delete if not using a buddy>
* gnome-db2html2/Makefile.am:
* gnome-db2html3/Makefile.am:
* gnome-info2html2/Makefile.am:
=== nautilus 1.0.5 ===
2001-09-21 Philip Langdale <philipl@mail.utexas.edu>
......
## Process this file with automake to produce Makefile.in.
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(GNOMEUI_CFLAGS) \
$(XML_CFLAGS)
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
LDADD = \
$(GNOME_LIBS) $(XML_LIBS)
LDADD =
bin_PROGRAMS = gnome-db2html2
......
......@@ -2,14 +2,10 @@ SUBDIRS= docbook gnome-customization
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(GNOMEUI_CFLAGS) \
-DPREFIXDIR=\""$(prefix)"\" \
$(GNOME_DB2HTML3_FLAG) \
$(XML2_CFLAGS) \
$(XSLT_CFLAGS)
$(GNOME_DB2HTML3_FLAG)
LDADD = \
$(GNOME_LIBS) $(XML2_LIBS) $(XSLT_LIBS)
LDADD =
bin_PROGRAMS = gnome-db2html3
......
## Process this file with automake to produce Makefile.in.
INCLUDES = \
$(GNOMEUI_CFLAGS)
LDADD = \
$(GNOME_LIBS) $(Z_LIBS) $(BZ_LIBS)
INCLUDES =
LDADD =
bin_PROGRAMS = gnome-info2html2
......
......@@ -16,15 +16,15 @@ LDADD=\
nautilus_history_view_SOURCES=nautilus-history-view.c
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_history.oaf.in \
server_in_files = \
Nautilus_View_history.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
EXTRA_DIST=$(server_DATA) $(server_in_files)
......@@ -18,14 +18,14 @@ nautilus_image_view_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_image.oaf.in \
server_in_files = \
Nautilus_View_image.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
EXTRA_DIST=$(server_DATA) $(server_in_files)
......@@ -24,13 +24,13 @@ nautilus_content_loser_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_content-loser.oaf.in \
server_in_files = \
Nautilus_View_content-loser.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
EXTRA_DIST=$(server_DATA) $(server_in_files) $(ui_DATA)
......@@ -24,13 +24,13 @@ nautilus_sidebar_loser_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_sidebar-loser.oaf.in \
server_in_files = \
Nautilus_View_sidebar-loser.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
EXTRA_DIST=$(server_DATA) $(server_in_files) $(ui_DATA)
......@@ -47,19 +47,19 @@ nautilus_mozilla_content_view_LDFLAGS = \
$(MOZILLA_COMPONENT_RPATH_FLAGS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_mozilla.oaf.in \
server_in_files = \
Nautilus_View_mozilla.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
uidir = $(datadir)/gnome/ui
ui_DATA = \
nautilus-mozilla-ui.xml \
$(NULL)
EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(oaf_in_files)
EXTRA_DIST = $(server_DATA) $(ui_DATA) $(server_in_files)
......@@ -62,17 +62,17 @@ nautilus_music_view_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
oafdir = $(datadir)/oaf
serverdir = $(datadir)/server
oaf_in_files = \
Nautilus_View_music.oaf.in \
server_in_files = \
Nautilus_View_music.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source) \
EXTRA_DIST=$(server_DATA) $(server_in_files) $(platform_source) \
configure.c \
fileinfo.c \
getbits.c
......@@ -26,17 +26,17 @@ nautiluspixmapdir = $(datadir)/pixmaps/nautilus
nautiluspixmap_DATA = news_bullet.png \
changed_bullet.png
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_View_news.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_View_news.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST= \
$(nautilus_DATA) \
$(nautiluspixmap_DATA) \
$(oaf_DATA)\
$(oaf_in_files) \
$(server_DATA)\
$(server_in_files) \
$(NULL)
......@@ -17,15 +17,15 @@ LDADD=\
nautilus_notes_SOURCES=nautilus-notes.c
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_View_notes.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_View_notes.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST= \
$(oaf_DATA)\
$(oaf_in_files) \
$(server_DATA)\
$(server_in_files) \
$(NULL)
......@@ -10,9 +10,7 @@ INCLUDES = \
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GNOMEUI_CFLAGS) \
$(BONOBO_CFLAGS) \
$(OAF_CFLAGS)
$(MODULE_CFLAGS)
bin_PROGRAMS = \
nautilus-sample-content-view
......@@ -24,20 +22,17 @@ nautilus_sample_content_view_SOURCES = \
nautilus_sample_content_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(BONOBOX_LIBS) \
$(VFS_LIBS) \
$(OAF_LIBS)
$(MODULE_LIBS)
uidir = $(datadir)/gnome/ui
ui_DATA = nautilus-sample-content-view-ui.xml
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_View_sample.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_View_sample.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
EXTRA_DIST = $(server_in_files) $(server_DATA) $(ui_DATA)
......@@ -27,14 +27,14 @@ nautilus_text_view_LDADD = \
uidir = $(datadir)/gnome/ui
ui_DATA = nautilus-text-view-ui.xml
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_View_text.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_View_text.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
EXTRA_DIST = $(server_in_files) $(server_DATA) $(ui_DATA)
......@@ -22,15 +22,15 @@ nautilus_throbber_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
oafdir = $(datadir)/oaf
oaf_in_files = \
Nautilus_Control_throbber.oaf.in \
serverdir = $(datadir)/server
server_in_files = \
Nautilus_Control_throbber.server.in \
$(NULL)
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = \
$(oaf_in_files) \
$(oaf_DATA) \
$(server_in_files) \
$(server_DATA) \
$(NULL)
......@@ -34,11 +34,11 @@ libnautilus_tree_view_la_SOURCES = \
libmain.c \
$(NULL)
oafdir = $(datadir)/oaf
oaf_in_files = Nautilus_View_tree.oaf.in
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
serverdir = $(datadir)/server
server_in_files = Nautilus_View_tree.server.in
server_DATA = $(server_in_files:.server.in=.server)
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
EXTRA_DIST = $(server_in_files) $(server_DATA)
......@@ -7,58 +7,96 @@ dnl it too, or it will never make it into the spec file!
dnl
dnl ==========================================================================
BONOBO_REQUIRED=1.0.9
ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.2
BONOBO_REQUIRED=1.103
EEL_REQUIRED=1.0.2
ESOUND_REQUIRED=0.2.22
GCONF_REQUIRED=0.12
GDK_PIXBUF_REQUIRED=0.10.0
GLIB_REQUIRED=1.2.9
GNOME_LIBS_REQUIRED=1.2.11
GNOME_REQUIRED=1.2.8
GNOME_VFS_REQUIRED=1.0.3
GTK_REQUIRED=1.2.9
GDK_PIXBUF_REQUIRED=1.3.9
GLIB_REQUIRED=1.3.9
GNOME_CANVAS_REQUIRED=1.104
GNOME_REQUIRED=1.104
GNOME_UI_REQUIRED=1.104
GNOME_VFS_REQUIRED=1.1
GTK_REQUIRED=1.3.9
IMLIB_REQUIRED=1.9.8
LIBRSVG_REQUIRED=1.0.1
LIBXML_REQUIRED=1.8.10
MEDUSA_REQUIRED=0.5.1
OAF_REQUIRED=0.6.5
ORBIT_REQUIRED=0.5.7
POPT_REQUIRED=1.5
RSVG_REQUIRED=1.1
SCROLLKEEPER_REQUIRED=0.1.4
XML_REQUIRED=2.4.6
AC_SUBST(EEL_REQUIRED)
AC_SUBST(ESOUND_REQUIRED)
AC_SUBST(GNOME_VFS_REQUIRED)
AC_SUBST(IMLIB_REQUIRED)
AC_SUBST(LIBRSVG_REQUIRED)
AC_SUBST(LIBXML_REQUIRED)
AC_SUBST(MEDUSA_REQUIRED)