From: APTX Date: Mon, 16 Apr 2012 02:00:56 +0000 (-0400) Subject: Import libferris 1.5.14 X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=libferris.git Import libferris 1.5.14 --- diff --git a/DBusGlue/Makefile.am b/DBusGlue/Makefile.am index dfa36c4..e8dc170 100644 --- a/DBusGlue/Makefile.am +++ b/DBusGlue/Makefile.am @@ -22,43 +22,43 @@ BUILT_SOURCES = broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_in broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_interface.cpp: ferris_internal_metadata_broker_introspect.xml qdbusxml2cpp -N -m -c broker -p broker_interface $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_interface.h -o broker_interface.moc + $(MOC) broker_interface.h -o broker_interface.moc qdbusxml2cpp -N -m -c broker -a broker_adaptor $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_adaptor.h -o broker_adaptor.moc + $(MOC) broker_adaptor.h -o broker_adaptor.moc worker_adaptor.h worker_adaptor.cpp worker_interface.h worker_interface.cpp: ferris_internal_metadata_worker_introspect.xml qdbusxml2cpp -N -m -c worker -p worker_interface $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_interface.h -o worker_interface.moc + $(MOC) worker_interface.h -o worker_interface.moc qdbusxml2cpp -N -m -c worker -a worker_adaptor $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_adaptor.h -o worker_adaptor.moc + $(MOC) worker_adaptor.h -o worker_adaptor.moc org_freedesktop_DBus.h org_freedesktop_DBus.cpp: org.freedesktop.DBus.xml qdbusxml2cpp -N -m -c fdoDBus -p org_freedesktop_DBus $(srcdir)/org.freedesktop.DBus.xml - moc-qt4 org_freedesktop_DBus.h -o org_freedesktop_DBus.moc + $(MOC) org_freedesktop_DBus.h -o org_freedesktop_DBus.moc org_freedesktop_DBus_Introspectable.h org_freedesktop_DBus_Introspectable.cpp: org.freedesktop.DBus.Introspectable.xml qdbusxml2cpp -N -m -c fdoDBusIntrospectable -p org_freedesktop_DBus_Introspectable $(srcdir)/org.freedesktop.DBus.Introspectable.xml - moc-qt4 org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc + $(MOC) org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc org_freedesktop_Hal_Device.h org_freedesktop_Hal_Device.cpp: org.freedesktop.Hal.Device.xml qdbusxml2cpp -N -m -c fdoHalDevice -p org_freedesktop_Hal_Device $(srcdir)/org.freedesktop.Hal.Device.xml - moc-qt4 org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc + $(MOC) org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc org_freedesktop_Hal_Device_Volume.h org_freedesktop_Hal_Device_Volume.cpp: org.freedesktop.Hal.Device.Volume.xml qdbusxml2cpp -N -m -c fdoHalDeviceVolume -p org_freedesktop_Hal_Device_Volume $(srcdir)/org.freedesktop.Hal.Device.Volume.xml - moc-qt4 org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc + $(MOC) org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc org_freedesktop_Hal_Manager.h org_freedesktop_Hal_Manager.cpp: org.freedesktop.Hal.Manager.xml qdbusxml2cpp -N -m -c fdoHalManager -p org_freedesktop_Hal_Manager $(srcdir)/org.freedesktop.Hal.Manager.xml - moc-qt4 org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc + $(MOC) org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc com_libferris_Volume_Manager.h com_libferris_Volume_Manager.cpp com_libferris_Volume_Manager_adaptor.h com_libferris_Volume_Manager_adaptor.cpp: com.libferris.Volume.Manager.xml qdbusxml2cpp -N -m -c fVolumeManager -p com_libferris_Volume_Manager $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc + $(MOC) com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc qdbusxml2cpp -N -m -c fVolumeManager -a com_libferris_Volume_Manager_adaptor $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc + $(MOC) com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc diff --git a/DBusGlue/Makefile.in b/DBusGlue/Makefile.in index f8f01d7..538d16e 100644 --- a/DBusGlue/Makefile.in +++ b/DBusGlue/Makefile.in @@ -165,6 +165,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -173,6 +175,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -228,6 +232,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -462,6 +467,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -534,6 +540,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -545,6 +552,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -624,6 +632,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1069,41 +1078,41 @@ uninstall-am: uninstall-serviceDATA broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_interface.cpp: ferris_internal_metadata_broker_introspect.xml qdbusxml2cpp -N -m -c broker -p broker_interface $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_interface.h -o broker_interface.moc + $(MOC) broker_interface.h -o broker_interface.moc qdbusxml2cpp -N -m -c broker -a broker_adaptor $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_adaptor.h -o broker_adaptor.moc + $(MOC) broker_adaptor.h -o broker_adaptor.moc worker_adaptor.h worker_adaptor.cpp worker_interface.h worker_interface.cpp: ferris_internal_metadata_worker_introspect.xml qdbusxml2cpp -N -m -c worker -p worker_interface $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_interface.h -o worker_interface.moc + $(MOC) worker_interface.h -o worker_interface.moc qdbusxml2cpp -N -m -c worker -a worker_adaptor $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_adaptor.h -o worker_adaptor.moc + $(MOC) worker_adaptor.h -o worker_adaptor.moc org_freedesktop_DBus.h org_freedesktop_DBus.cpp: org.freedesktop.DBus.xml qdbusxml2cpp -N -m -c fdoDBus -p org_freedesktop_DBus $(srcdir)/org.freedesktop.DBus.xml - moc-qt4 org_freedesktop_DBus.h -o org_freedesktop_DBus.moc + $(MOC) org_freedesktop_DBus.h -o org_freedesktop_DBus.moc org_freedesktop_DBus_Introspectable.h org_freedesktop_DBus_Introspectable.cpp: org.freedesktop.DBus.Introspectable.xml qdbusxml2cpp -N -m -c fdoDBusIntrospectable -p org_freedesktop_DBus_Introspectable $(srcdir)/org.freedesktop.DBus.Introspectable.xml - moc-qt4 org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc + $(MOC) org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc org_freedesktop_Hal_Device.h org_freedesktop_Hal_Device.cpp: org.freedesktop.Hal.Device.xml qdbusxml2cpp -N -m -c fdoHalDevice -p org_freedesktop_Hal_Device $(srcdir)/org.freedesktop.Hal.Device.xml - moc-qt4 org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc + $(MOC) org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc org_freedesktop_Hal_Device_Volume.h org_freedesktop_Hal_Device_Volume.cpp: org.freedesktop.Hal.Device.Volume.xml qdbusxml2cpp -N -m -c fdoHalDeviceVolume -p org_freedesktop_Hal_Device_Volume $(srcdir)/org.freedesktop.Hal.Device.Volume.xml - moc-qt4 org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc + $(MOC) org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc org_freedesktop_Hal_Manager.h org_freedesktop_Hal_Manager.cpp: org.freedesktop.Hal.Manager.xml qdbusxml2cpp -N -m -c fdoHalManager -p org_freedesktop_Hal_Manager $(srcdir)/org.freedesktop.Hal.Manager.xml - moc-qt4 org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc + $(MOC) org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc com_libferris_Volume_Manager.h com_libferris_Volume_Manager.cpp com_libferris_Volume_Manager_adaptor.h com_libferris_Volume_Manager_adaptor.cpp: com.libferris.Volume.Manager.xml qdbusxml2cpp -N -m -c fVolumeManager -p com_libferris_Volume_Manager $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc + $(MOC) com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc qdbusxml2cpp -N -m -c fVolumeManager -a com_libferris_Volume_Manager_adaptor $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc + $(MOC) com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc # 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 --git a/DBusGlue/broker_adaptor.h b/DBusGlue/broker_adaptor.h index 5bae597..3b3a56f 100644 --- a/DBusGlue/broker_adaptor.h +++ b/DBusGlue/broker_adaptor.h @@ -9,8 +9,8 @@ * before re-generating it. */ -#ifndef BROKER_ADAPTOR_H_1329958831 -#define BROKER_ADAPTOR_H_1329958831 +#ifndef BROKER_ADAPTOR_H_1333760654 +#define BROKER_ADAPTOR_H_1333760654 #include #include diff --git a/DBusGlue/broker_interface.h b/DBusGlue/broker_interface.h index cf92215..d0891e7 100644 --- a/DBusGlue/broker_interface.h +++ b/DBusGlue/broker_interface.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef BROKER_INTERFACE_H_1329958831 -#define BROKER_INTERFACE_H_1329958831 +#ifndef BROKER_INTERFACE_H_1333760654 +#define BROKER_INTERFACE_H_1333760654 #include #include diff --git a/DBusGlue/org_freedesktop_DBus.h b/DBusGlue/org_freedesktop_DBus.h index 18123f4..d99df73 100644 --- a/DBusGlue/org_freedesktop_DBus.h +++ b/DBusGlue/org_freedesktop_DBus.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef ORG_FREEDESKTOP_DBUS_H_1329958831 -#define ORG_FREEDESKTOP_DBUS_H_1329958831 +#ifndef ORG_FREEDESKTOP_DBUS_H_1333760654 +#define ORG_FREEDESKTOP_DBUS_H_1333760654 #include #include diff --git a/DBusGlue/org_freedesktop_DBus_Introspectable.h b/DBusGlue/org_freedesktop_DBus_Introspectable.h index a33b782..081ff08 100644 --- a/DBusGlue/org_freedesktop_DBus_Introspectable.h +++ b/DBusGlue/org_freedesktop_DBus_Introspectable.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef ORG_FREEDESKTOP_DBUS_INTROSPECTABLE_H_1329958831 -#define ORG_FREEDESKTOP_DBUS_INTROSPECTABLE_H_1329958831 +#ifndef ORG_FREEDESKTOP_DBUS_INTROSPECTABLE_H_1333760654 +#define ORG_FREEDESKTOP_DBUS_INTROSPECTABLE_H_1333760654 #include #include diff --git a/DBusGlue/org_freedesktop_Hal_Device.h b/DBusGlue/org_freedesktop_Hal_Device.h index 26f8976..533d368 100644 --- a/DBusGlue/org_freedesktop_Hal_Device.h +++ b/DBusGlue/org_freedesktop_Hal_Device.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef ORG_FREEDESKTOP_HAL_DEVICE_H_1329958831 -#define ORG_FREEDESKTOP_HAL_DEVICE_H_1329958831 +#ifndef ORG_FREEDESKTOP_HAL_DEVICE_H_1333760654 +#define ORG_FREEDESKTOP_HAL_DEVICE_H_1333760654 #include #include diff --git a/DBusGlue/org_freedesktop_Hal_Device_Volume.h b/DBusGlue/org_freedesktop_Hal_Device_Volume.h index 0bb04bb..c5c1539 100644 --- a/DBusGlue/org_freedesktop_Hal_Device_Volume.h +++ b/DBusGlue/org_freedesktop_Hal_Device_Volume.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef ORG_FREEDESKTOP_HAL_DEVICE_VOLUME_H_1329958831 -#define ORG_FREEDESKTOP_HAL_DEVICE_VOLUME_H_1329958831 +#ifndef ORG_FREEDESKTOP_HAL_DEVICE_VOLUME_H_1333760654 +#define ORG_FREEDESKTOP_HAL_DEVICE_VOLUME_H_1333760654 #include #include diff --git a/DBusGlue/org_freedesktop_Hal_Manager.h b/DBusGlue/org_freedesktop_Hal_Manager.h index 2b0d813..c146215 100644 --- a/DBusGlue/org_freedesktop_Hal_Manager.h +++ b/DBusGlue/org_freedesktop_Hal_Manager.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef ORG_FREEDESKTOP_HAL_MANAGER_H_1329958831 -#define ORG_FREEDESKTOP_HAL_MANAGER_H_1329958831 +#ifndef ORG_FREEDESKTOP_HAL_MANAGER_H_1333760654 +#define ORG_FREEDESKTOP_HAL_MANAGER_H_1333760654 #include #include diff --git a/DBusGlue/worker_adaptor.h b/DBusGlue/worker_adaptor.h index eeb87cd..f4473bd 100644 --- a/DBusGlue/worker_adaptor.h +++ b/DBusGlue/worker_adaptor.h @@ -9,8 +9,8 @@ * before re-generating it. */ -#ifndef WORKER_ADAPTOR_H_1329958831 -#define WORKER_ADAPTOR_H_1329958831 +#ifndef WORKER_ADAPTOR_H_1333760654 +#define WORKER_ADAPTOR_H_1333760654 #include #include diff --git a/DBusGlue/worker_interface.h b/DBusGlue/worker_interface.h index 211309e..e0c3345 100644 --- a/DBusGlue/worker_interface.h +++ b/DBusGlue/worker_interface.h @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef WORKER_INTERFACE_H_1329958831 -#define WORKER_INTERFACE_H_1329958831 +#ifndef WORKER_INTERFACE_H_1333760654 +#define WORKER_INTERFACE_H_1333760654 #include #include diff --git a/Ferris/Context.cpp b/Ferris/Context.cpp index 46278b8..b3b2398 100644 --- a/Ferris/Context.cpp +++ b/Ferris/Context.cpp @@ -1760,7 +1760,9 @@ StaticContentLeafContext::StaticContentLeafContext( Context* parent, ++cache; m_AddedOrderID = cache; } - + + public: + DirNameContext_Base( const fh_context& ctx, bool setupEventConnections = true ) : _Base( ctx ), @@ -1835,7 +1837,8 @@ StaticContentLeafContext::StaticContentLeafContext( Context* parent, Throw_NoSuchAttribute( tostr(ss), this ); } } - + + cerr << "getAttribute() no dele:" << getEANamesNotToDelegate().count( rdn ) << " rdn:" << rdn << endl; if( getEANamesNotToDelegate().count( rdn ) ) return _BaseNoDelegate::getAttribute( rdn ); return _Base::getAttribute( rdn ); @@ -2447,6 +2450,161 @@ StaticContentLeafContext::StaticContentLeafContext( Context* parent, /********************************************************************************/ /********************************************************************************/ + /** + * This is the root context for docidea:// + * + * This allows clients to store just hte docid and send it to the server to have + * operations performed like 'cat' + */ + class FERRISEXP_DLLLOCAL EAIndexDocIDContext + : + public FakeInternalContext + { + guint32 newFileNumber; + + friend class EAIndexDocIDContext_RootContextDropper; + + protected: + + virtual void priv_read() + { + emitExistsEventForEachItemRAII _raii1( this ); + } + + protected: + + virtual bool isDir() + { + return true; + } + + SelectionContext* + priv_CreateContext( Context* parent, string rdn ) + { + SelectionContext* ret = new SelectionContext( this, rdn ); + return ret; + } + + + public: + + EAIndexDocIDContext(); + virtual ~EAIndexDocIDContext(); + + std::string getURL() + { + fh_stringstream ss; + ss << getURLScheme() << "://" << getDirPath(); + return tostr(ss); + } + + // + // Short cut loading each dir unless absolutely needed. + // + fh_context priv_getSubContext( const string& rdn ) + throw( NoSuchSubContext ) + { + try + { + Items_t::iterator isSubContextBoundCache; + if( priv_isSubContextBound( rdn, isSubContextBoundCache ) ) + { + return *isSubContextBoundCache; + } + + if( rdn.empty() ) + { + fh_stringstream ss; + ss << "NoSuchSubContext no rdn given"; + Throw_NoSuchSubContext( tostr(ss), this ); + } + else if( rdn[0] == '/' ) + { + fh_stringstream ss; + ss << "NoSuchSubContext no files start with unescaped '/' as filename"; + Throw_NoSuchSubContext( tostr(ss), this ); + } + + stringstream urlss; + urlss << "eaquery://filter/(docid==" << rdn << ")"; +// cerr << "url:" << urlss.str() << endl; + fh_context c = Resolve( urlss.str() ); + cerr << "c:" << c->getURL() << endl; + if( !c->getSubContextCount() ) + { + fh_stringstream ss; + ss << "NoSuchSubContext no matching document for given docid:" << rdn; + Throw_NoSuchSubContext( tostr(ss), this ); + } + + c = (*c->begin()); + + fh_context newc = new Context_SelectionContextRDNConflictResolver_MonsterName( this, c, rdn ); + addNewChild( newc ); + + // cerr << "newc:" << newc->getURL() << endl; + // cerr << " rdn:" << rdn << endl; + // cerr << "newc.rdn:" << newc->getDirName() << endl; + // cerr << "newc.attr.rdn:" << getStrAttr( newc, "name", "" ) << endl; + return newc; + } + catch( NoSuchSubContext& e ) + { + throw e; + } + catch( exception& e ) + { + string s = e.what(); + Throw_NoSuchSubContext( s, this ); + } + catch(...) + {} + fh_stringstream ss; + ss << "NoSuchSubContext:" << rdn; + Throw_NoSuchSubContext( tostr(ss), this ); + } + }; + + EAIndexDocIDContext::EAIndexDocIDContext() + { + setContext( 0, "/" ); + createStateLessAttributes(); + } + + + EAIndexDocIDContext::~EAIndexDocIDContext() + { + } + + + class FERRISEXP_DLLLOCAL EAIndexDocIDContext_RootContextDropper + : + public RootContextDropper + { + public: + EAIndexDocIDContext_RootContextDropper() + { + RootContextFactory::Register( "docidea", this ); + } + + fh_context Brew( RootContextFactory* rf ) + throw( RootContextCreationFailed ) + { + return new EAIndexDocIDContext(); + } + }; + static EAIndexDocIDContext_RootContextDropper ___EAIndexDocIDContext_static_init; + + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + void ManyBaseToOneViewContext::common_setup( fh_context parent, fh_context ctx, diff --git a/Ferris/EAIndexer.cpp b/Ferris/EAIndexer.cpp index b8b0929..f45bb7c 100644 --- a/Ferris/EAIndexer.cpp +++ b/Ferris/EAIndexer.cpp @@ -95,7 +95,7 @@ namespace Ferris { return getEDBString( GET_FDB_GENERAL(), "EAINDEX_EANAMES_NOT_TO_INDEX", - "name,language-human,content,as-xml,as-text,as-rdf," + "name,language-human,content,as-xml,as-json,as-text,as-rdf," "block-count,dontfollow-block-count,inode,dontfollow-inode,dontfollow-size," "dontfollow-block-size,dontfollow-device,dontfollow-device-type," "dontfollow-filesystem-filetype,dontfollow-hard-link-count," diff --git a/Ferris/EAIndexerMetaInterface.cpp b/Ferris/EAIndexerMetaInterface.cpp index 18796dc..69bc7b1 100644 --- a/Ferris/EAIndexerMetaInterface.cpp +++ b/Ferris/EAIndexerMetaInterface.cpp @@ -1305,6 +1305,13 @@ namespace Ferris return ATTRTYPEID_CIS; } + + bool + MetaEAIndexerInterface::isCaseSensitive( const std::string s ) + { + return( getIsCaseSensitiveRegex()->operator()( s ) ); + } + docNumSet_t& MetaEAIndexerInterface::BuildQuerySQL( fh_context q, diff --git a/Ferris/EAIndexerMetaInterface.hh b/Ferris/EAIndexerMetaInterface.hh index e2e3963..f457bdb 100644 --- a/Ferris/EAIndexerMetaInterface.hh +++ b/Ferris/EAIndexerMetaInterface.hh @@ -669,7 +669,11 @@ namespace Ferris * indexing run. */ int getFilesIndexedCount(); - + + /* + * if this is a mixed case string then true + */ + bool isCaseSensitive( const std::string s ); }; diff --git a/Ferris/Enamel.cpp b/Ferris/Enamel.cpp index 0a6f5e5..e0344f9 100644 --- a/Ferris/Enamel.cpp +++ b/Ferris/Enamel.cpp @@ -798,6 +798,8 @@ namespace Ferris c.insert(make_pair(LG_FACEBOOK::Instance().getName(), &LG_FACEBOOK::Instance())); c.insert(make_pair(LG_VIMEO::Instance().getName(), &LG_VIMEO::Instance())); c.insert(make_pair(LG_IDENTICA::Instance().getName(), &LG_IDENTICA::Instance())); + c.insert(make_pair(LG_ZONEMINDER::Instance().getName(), &LG_ZONEMINDER::Instance())); + c.insert(make_pair(LG_FERRISREST::Instance().getName(), &LG_FERRISREST::Instance())); c.insert(make_pair(LG_QIO::Instance().getName(), &LG_QIO::Instance())); c.insert(make_pair(LG_WEBSERVICE::Instance().getName(), &LG_WEBSERVICE::Instance())); c.insert(make_pair(LG_GSTREAMER::Instance().getName(), &LG_GSTREAMER::Instance())); @@ -1018,6 +1020,8 @@ namespace Ferris char const lg_facebook_class_name[] ="ferris-logging-facebook"; char const lg_vimeo_class_name[] ="ferris-logging-vimeo"; char const lg_identica_class_name[] ="ferris-logging-identica"; + char const lg_zoneminder_class_name[] ="ferris-logging-zoneminder"; + char const lg_ferrisrest_class_name[] ="ferris-logging-ferrisrest"; char const lg_qio_class_name[] ="ferris-logging-qio"; char const lg_webservice_class_name[] ="ferris-logging-webservice"; char const lg_gstreamer_class_name[] ="ferris-logging-gstreamer"; diff --git a/Ferris/Enamel.hh b/Ferris/Enamel.hh index 6d81f06..2d8a8b5 100644 --- a/Ferris/Enamel.hh +++ b/Ferris/Enamel.hh @@ -2061,6 +2061,36 @@ namespace Logging #define LG_IDENTICA_D LG_IDENTICA(Ferris::Timber::_SBufT::PRI_DEBUG) #define LG_IDENTICA_D_ACTIVE (Ferris::Logging::LG_IDENTICA::Instance().state() & Ferris::Timber::_SBufT::PRI_DEBUG) + + /////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////// + + extern FERRISEXP_API char const lg_zoneminder_class_name[]; + typedef LogState< Ferris::Timber::_SBufT::FAC_L6, lg_zoneminder_class_name > lg_zoneminder_class; + typedef Loki::SingletonHolder LG_ZONEMINDER; + +#define LG_ZONEMINDER(x) LOGGING_SWITCH_FUNCTION(Ferris::Logging::LG_ZONEMINDER::Instance(), x)< lg_ferrisrest_class; + typedef Loki::SingletonHolder LG_FERRISREST; + +#define LG_FERRISREST(x) LOGGING_SWITCH_FUNCTION(Ferris::Logging::LG_FERRISREST::Instance(), x)<ensureUpdateMetaDataCalled(); + fh_stringstream ss; + ss << contextToJSON( c ); + return ss; +} + + fh_iostream Context::SL_getAsXML( Context* c, const std::string& rdn, EA_Atom* atom ) { @@ -7439,7 +7453,7 @@ Context::getAsRDFXML( fh_stringstream& ss ) { std::string rdn = *iter; - if( rdn == "as-rdf" || rdn == "as-xml" || rdn == "content" + if( rdn == "as-rdf" || rdn == "as-xml" || rdn == "as-json" || rdn == "content" || rdn == "as-text" || starts_with( rdn, "exif:thumbnail") ) continue; @@ -7848,7 +7862,35 @@ Context::getAsRDFXML( fh_stringstream& ss ) ss << c->getMimeType( true ); return ss; } - + +std::string chomp( const std::string& s ) +{ + PostfixTrimmer trimmer; + trimmer.push_back( "\n" ); + trimmer.push_back( "\r" ); + return trimmer( s ); +} + + static fh_stringstream + SL_getMimetypeFromFileCommandStream( Context* c, const std::string& rdn, EA_Atom* atom ) + { + fh_stringstream ss; + if( isFalse( getStrAttr( c, "is-special", "0" ))) + { + fh_runner r = new Runner(); + r->pushCommandLineArg( "file" ); + r->pushCommandLineArg( "--brief" ); + r->pushCommandLineArg( "--mime-type" ); + r->pushCommandLineArg( c->getDirPath() ); + r->Run(); + fh_istream outss = r->getStdOut(); + ss << chomp( StreamToString(outss) ); + } + + return ss; + } + + static fh_stringstream SL_getFiletypeStream( Context* c, const std::string& rdn, EA_Atom* atom ) { @@ -9273,6 +9315,9 @@ Context::createStateLessAttributes( bool force ) ContextClass_SLEA( "mimetype-from-content", SL_getMimetypeFromContentStream, FXD_MIMETYPE ); + ContextClass_SLEA( "mimetype-from-file-command", + SL_getMimetypeFromFileCommandStream, + FXD_MIMETYPE ); #ifdef HAVE_LIBFILE ContextClass_SLEA( "filetype", SL_getFiletypeStream, XSD_BASIC_STRING ); #endif @@ -9359,6 +9404,7 @@ Context::createStateLessAttributes( bool force ) ContextClass_SLEA( "as-xml", SL_getAsXML, SL_getAsXML, SL_getAsXMLClosed, FXD_XMLDOCSTRING ); + ContextClass_SLEA( "as-json", SL_getAsJSON, XSD_BASIC_STRING ); ContextClass_SLEA( "as-text", SL_getAsText, XSD_BASIC_STRING ); ContextClass_SLEA( "as-rdf", SL_getAsRDF, FXD_XMLDOCSTRING ); diff --git a/Ferris/Ferris.hh b/Ferris/Ferris.hh index 6498fb0..ca396cc 100644 --- a/Ferris/Ferris.hh +++ b/Ferris/Ferris.hh @@ -1404,6 +1404,7 @@ namespace Ferris FERRIS_LS fh_istream SL_getSizeHumanReadableStream( Context* c, const std::string& rdn, EA_Atom* atom ); FERRIS_LS fh_istream SL_getContentIStream( Context* c, const std::string& rdn, EA_Atom* atom ); FERRIS_LS fh_istream SL_getIsRemote( Context* c, const std::string& rdn, EA_Atom* atom ); + FERRIS_LS fh_iostream SL_getAsJSON( Context* c, const std::string& rdn, EA_Atom* atom ); FERRIS_LS fh_iostream SL_getAsXML( Context* c, const std::string& rdn, EA_Atom* atom ); FERRIS_LS fh_istream SL_getAsText( Context* c, const std::string& rdn, EA_Atom* atom ); diff --git a/Ferris/FerrisBoost.cpp b/Ferris/FerrisBoost.cpp index e8cef74..f8687cb 100644 --- a/Ferris/FerrisBoost.cpp +++ b/Ferris/FerrisBoost.cpp @@ -194,7 +194,7 @@ namespace Ferris boost::smatch matches; if(regex_match( s, matches, e, flags )) { -// cerr << "matches.size()" << endl; +// cerr << "matches.size:" << matches.size() << endl; if( matches.size() == 2 ) { string ret = matches[1]; diff --git a/Ferris/FerrisDOM.cpp b/Ferris/FerrisDOM.cpp index 05d8f64..d1e7743 100644 --- a/Ferris/FerrisDOM.cpp +++ b/Ferris/FerrisDOM.cpp @@ -3773,7 +3773,7 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) } - FERRISEXP_API std::string getStrSubCtx( DOMNode* c, + FERRISEXP_API std::string getStrSubCtx( const DOMNode* c, std::string subname, std::string def, bool getAllLines, @@ -3912,7 +3912,9 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) * * Note that recurse is currently ignored */ - std::string contextToXML( fh_context c, bool recurse, bool includeContent ) + std::string contextToXML( fh_context c, + bool recurse, + bool includeContent ) { Factory::ensureXMLPlatformInitialized(); @@ -3936,6 +3938,8 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) continue; if( k == "as-rdf" ) continue; + if( k == "as-json" ) + continue; try { @@ -3961,6 +3965,112 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) return tostr( retss ); } + std::string stringmapToXML( const stringmap_t& sm ) + { + DOMImplementation *impl = Factory::getDefaultDOMImpl(); + fh_domdoc doc = impl->createDocument( 0, X("result"), 0 ); + DOMElement* root = doc->getDocumentElement(); + + for( stringmap_t::const_iterator si = sm.begin(); si != sm.end(); ++si ) + { + string k = si->first; + string v = si->second; + DOMElement* e = doc->createElement( X("keyval") ); + root->appendChild( e ); + setAttribute( e, "key", k ); + DOMText* payload = doc->createTextNode( X(v.c_str())); + e->appendChild( payload ); + } + + fh_stringstream retss = tostream( doc ); + return tostr( retss ); + } + + + static std::string contextToXMLProcessContext( fh_context c, + stringlist_t eatoinclude, + bool includeContent ) + { + DOMImplementation *impl = Factory::getDefaultDOMImpl(); + fh_domdoc doc = impl->createDocument( 0, X("context"), 0 ); + + DOMElement* root = doc->getDocumentElement(); +// doc->appendChild( root ); + setAttribute( root, "taken-from-url", c->getURL() ); + + stringlist_t::iterator ai = eatoinclude.begin(); + for( ; ai != eatoinclude.end(); ++ai ) + { + string k = *ai; + if( !includeContent && k == "content" ) + continue; + if( k == "as-xml" ) + continue; + if( k == "as-rdf" ) + continue; + if( k == "as-json" ) + continue; + + try + { + string v = getStrAttr( c, k, "", true, true ); + + DOMElement* e = doc->createElement( X("keyval") ); + root->appendChild( e ); + setAttribute( e, "key", k ); +// setAttribute( e, "value", v ); + DOMText* payload = doc->createTextNode( X(v.c_str())); + e->appendChild( payload ); + } + catch( exception& e ) + { + } + } + +// string content = getStrAttr( c, "content", "", true, true ); +// DOMText* t = doc->createTextNode( X(content.c_str()) ); +// root->appendChild( t ); + + fh_stringstream retss = tostream( doc ); + return tostr( retss ); + } + + /** + * Create XML describing the contents and EA for this context. + * optionally include the whole subtree in the output + * + * Note that recurse is currently ignored + */ + std::string contextToXML( fh_context c, + stringlist_t eatoinclude, + int recurse, + bool includeContent ) + { + stringstream retss; + Factory::ensureXMLPlatformInitialized(); + + if( recurse == 1 ) + { + fh_stringstream tmpss; + tmpss << contextToXMLProcessContext( c, eatoinclude, includeContent ); + retss << Util::replace_all( tostr(tmpss), "", "" ); + + for( Context::iterator ci = c->begin(); ci != c->end(); ++ci ) + { + fh_stringstream tmpss; + tmpss << contextToXMLProcessContext( *ci, eatoinclude, includeContent ); + tmpss = trimXMLDeclaration( tmpss, true ); + retss << tostr( tmpss ); + } + retss << ""; + } + else + { + retss << contextToXMLProcessContext( c, eatoinclude, includeContent ); + } + return retss.str(); + } + /** @@ -4170,7 +4280,7 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) } - DOMElement* getChildElement( DOMNode* node, const std::string& name ) + DOMElement* getChildElement( const DOMNode* node, const std::string& name ) { DOMNodeList* nl = node->getChildNodes(); for( int i=0; i < nl->getLength(); ++i ) @@ -4188,6 +4298,13 @@ static short myCompareDocumentPosition(const DOMNode* x1, const DOMNode* other) return 0; } + std::string getChildElementText( DOMNode* node, const std::string& name ) + { + DOMElement* e = getChildElement( node, name ); + return e ? getChildText( e ) : ""; + } + + std::list< DOMElement* > getAllChildrenElements( DOMNode* node, const std::string& name, bool recurse ) diff --git a/Ferris/FerrisDOM.hh b/Ferris/FerrisDOM.hh index 7206452..ce368c3 100644 --- a/Ferris/FerrisDOM.hh +++ b/Ferris/FerrisDOM.hh @@ -378,7 +378,7 @@ FerrisException_CodeState( __FILE__ , __LINE__ , __PRETTY_FUNCTION__ ), \ const std::string& ns, const std::string& k ); - FERRISEXP_API std::string getStrSubCtx( DOMNode* c, + FERRISEXP_API std::string getStrSubCtx( const DOMNode* c, std::string subname, std::string def = "", bool getAllLines = false, @@ -402,8 +402,14 @@ FerrisException_CodeState( __FILE__ , __LINE__ , __PRETTY_FUNCTION__ ), \ FERRISEXP_API stringlist_t& readList( fh_istream iss, stringlist_t& ret ); FERRISEXP_API std::string contextToXML( fh_context c, - bool recurse = false, - bool includeContent = true ); + bool recurse = false, + bool includeContent = true ); + FERRISEXP_API std::string contextToXML( fh_context c, + stringlist_t eatoinclude, + int recurse = 0, + bool includeContent = true ); + FERRISEXP_API std::string stringmapToXML( const stringmap_t& sm ); + FERRISEXP_API void updateFromXML( fh_context c, const std::string& xml_data, bool recurse = false, @@ -441,7 +447,8 @@ FerrisException_CodeState( __FILE__ , __LINE__ , __PRETTY_FUNCTION__ ), \ /** * Get the child element with the given name or null */ - FERRISEXP_API DOMElement* getChildElement( DOMNode* node, const std::string& name ); + FERRISEXP_API DOMElement* getChildElement( const DOMNode* node, const std::string& name ); + FERRISEXP_API std::string getChildElementText( DOMNode* node, const std::string& name ); /** * Get all the children elements with the given name @@ -450,7 +457,6 @@ FerrisException_CodeState( __FILE__ , __LINE__ , __PRETTY_FUNCTION__ ), \ getAllChildrenElements( DOMNode* node, const std::string& name, bool recurse = true ); - FERRISEXP_API std::list< DOMElement* >& getAllChildrenElements( DOMNode* node, const std::string& name, diff --git a/Ferris/FerrisQt.cpp b/Ferris/FerrisQt.cpp index 6eb22f2..00c315a 100644 --- a/Ferris/FerrisQt.cpp +++ b/Ferris/FerrisQt.cpp @@ -40,6 +40,8 @@ #include +#include + #define DEBUG LG_QIO_D using namespace std; @@ -109,6 +111,187 @@ namespace Ferris } return u; } + + std::string toJSONKey( const std::string& s ) + { + string ret = s; + ret = Util::replace_all( ret, '-', '_' ); + ret = Util::replace_all( ret, ':', '_' ); + return ret; + } + + void contextToJSONProcessContext( fh_context c, + QVariantMap& dm, + stringlist_t& an, + bool includeContent ) + { + typedef stringlist_t::iterator I; + for( I ai = an.begin(); ai != an.end(); ++ai ) + { + string k = *ai; + if( !includeContent && k == "content" ) + continue; + if( k == "as-xml" ) + continue; + if( k == "as-rdf" ) + continue; + if( k == "as-json" ) + continue; + + try + { + string v = getStrAttr( c, k, "", true, true ); + dm[ toJSONKey( k ).c_str() ] = v.c_str(); + } + catch( exception& e ) + { + } + } + } + + stringlist_t& getDefaultEAToIncludeJSON() + { + static stringlist_t eatoinclude; + if( eatoinclude.empty() ) + { + eatoinclude.push_back("url"); + eatoinclude.push_back("name"); + eatoinclude.push_back("size"); + eatoinclude.push_back("size-human-readable"); + eatoinclude.push_back("mtime"); + eatoinclude.push_back("atime"); + eatoinclude.push_back("ctime"); + eatoinclude.push_back("mtime-display"); + } + return eatoinclude; + } + + std::string contextlistToJSON( fh_contextlist cl, + bool includeContent ) + { + stringlist_t& eatoinclude = getDefaultEAToIncludeJSON(); + return contextlistToJSON( cl, eatoinclude, includeContent ); + } + + + static QVariantMap XMLToJSONVisit( fh_domdoc doc, DOMElement* e ) + { + QVariantMap dm; + DOMNamedNodeMap* attributes = e->getAttributes(); + int attrCount = attributes->getLength(); + for (int i = 0; i < attrCount; i++) + { + DOMNode* attribute = attributes->item(i); + const string& n = tostr(attribute->getNodeName()); + const string& v = tostr(attribute->getNodeValue()); + dm[ n.c_str() ] = v.c_str(); + } + return dm; + } + + std::string XMLToJSON( fh_domdoc doc ) + { + QVariantList dl; + DOMElement* root = doc->getDocumentElement(); + dl << XMLToJSONVisit( doc, root ); + + static int i = 0; + XML::domnode_list_t nodes = XML::getChildren( root ); + for( XML::domnode_list_t::iterator di = nodes.begin(); di != nodes.end(); ++di ) + { + DOMElement* e = (DOMElement*)*di; + dl << XMLToJSONVisit( doc, e ); + } + QJson::Serializer zz; + QByteArray ba = zz.serialize( dl ); + string ret = tostr(ba); + return ret; + } + + + + std::string stringmapToJSON( const stringmap_t& sm ) + { + QVariantMap dm; + for( stringmap_t::const_iterator si = sm.begin(); si != sm.end(); ++si ) + { + string k = si->first; + string v = si->second; + dm[ k.c_str() ] = v.c_str(); + } + + QJson::Serializer zz; + QByteArray ba = zz.serialize( dm ); + string ret = tostr(ba); + return ret; + + } + + + std::string contextlistToJSON( fh_contextlist cl, + stringlist_t eatoinclude, + bool includeContent ) + { + QVariantMap top; + stringlist_t& an = eatoinclude; + for( Context::iterator ci = cl->begin(); ci != cl->end(); ++ci ) + { + QVariantMap dm; + std::string rdn = (*ci)->getURL(); + contextToJSONProcessContext( *ci, dm, an, includeContent ); + top[ rdn.c_str() ] = dm; + } + QJson::Serializer zz; + QByteArray ba = zz.serialize( top ); + string ret = tostr(ba); + return ret; + } + + + std::string contextToJSON( fh_context c, + stringlist_t eatoinclude, + int recurse, + bool includeContent ) + { + std::string ret; + QVariantMap top; + + // typedef AttributeCollection::AttributeNames_t::iterator I; + // AttributeCollection::AttributeNames_t an; + // c->getAttributeNames( an ); + stringlist_t& an = eatoinclude; + + if( recurse == 1 ) + { + for( Context::iterator ci = c->begin(); ci != c->end(); ++ci ) + { + QVariantMap dm; + std::string rdn = (*ci)->getDirName(); + contextToJSONProcessContext( *ci, dm, an, includeContent ); + top[ rdn.c_str() ] = dm; + } + } + else + { + QVariantMap dm; + contextToJSONProcessContext( c, dm, an, includeContent ); + top = dm; + } + + QJson::Serializer zz; + QByteArray ba = zz.serialize( top ); + ret = tostr(ba); + return ret; + } + + + std::string contextToJSON( fh_context c, + int recurse, + bool includeContent ) + { + stringlist_t& eatoinclude = getDefaultEAToIncludeJSON(); + return contextToJSON( c, eatoinclude, recurse, includeContent ); + } @@ -1145,6 +1328,23 @@ public: g_main_loop_quit( m_loop ); } + void wait( QNetworkReply* r ) + { + ensureQApplication(); + + QNetworkAccessManager* qm = r->manager(); + + QEventLoop* loop = new QEventLoop(0); + qm->connect( qm, SIGNAL(finished(QNetworkReply*)), loop, SLOT(quit()) ); + if( r->isFinished() ) + return; +// cerr << "waiting on reply...." << endl; + loop->exec(); +// return reply; + +// sleep(4); + } + /********************************************************************************/ /********************************************************************************/ diff --git a/Ferris/FerrisQt_private.hh b/Ferris/FerrisQt_private.hh index f3275d5..e7a590a 100644 --- a/Ferris/FerrisQt_private.hh +++ b/Ferris/FerrisQt_private.hh @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -83,6 +84,27 @@ namespace Ferris FERRISEXP_API stringmap_t to_std_map( const QList >& qm ); FERRISEXP_API QUrl& addQueryItems( QUrl& u, const stringmap_t& m ); + // WARNING: XMLToJSON is partially implemented. + FERRISEXP_API std::string XMLToJSON( fh_domdoc doc ); + FERRISEXP_API std::string stringmapToJSON( const stringmap_t& sm ); + FERRISEXP_API std::string contextToJSON( fh_context c, + int recurse = 0, + bool includeContent = true ); + FERRISEXP_API std::string contextToJSON( fh_context c, + stringlist_t eatoinclude, + int recurse = 0, + bool includeContent = true ); + FERRISEXP_API std::string contextlistToJSON( fh_contextlist cl, + stringlist_t eatoinclude, + bool includeContent ); + FERRISEXP_API std::string contextlistToJSON( fh_contextlist cl, + bool includeContent ); + FERRISEXP_API void contextToJSONProcessContext( fh_context c, + QVariantMap& dm, + stringlist_t& an, + bool includeContent ); + + /********************************************************************************/ /********************************************************************************/ /********************************************************************************/ @@ -103,6 +125,9 @@ namespace Ferris void unblock( QNetworkReply* r ); }; + void wait( QNetworkReply* r ); + + /********************************************************************************/ /********************************************************************************/ /********************************************************************************/ diff --git a/Ferris/Ferrisls.hh b/Ferris/Ferrisls.hh index e8006cd..d0db02e 100644 --- a/Ferris/Ferrisls.hh +++ b/Ferris/Ferrisls.hh @@ -690,6 +690,39 @@ public: /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// +class FERRISEXP_API Ferrisls_json_display + : + public Ferrisls_long_display + { + typedef Ferrisls_long_display _Base; + + virtual void workStarting(); + virtual void workComplete(); + virtual void EnteringContext(fh_context ctx); + virtual void LeavingContext(fh_context ctx); + + protected: + + struct Ferrisls_json_display_private* P; + + virtual void ShowAttributes( fh_context ctx ); + virtual void PrintEA( fh_context ctx, + int i, + const std::string& attr, + const std::string& EA ); + + + public: + Ferrisls_json_display(); + virtual ~Ferrisls_json_display(); + + }; + + FERRIS_SMARTPTR( Ferrisls_json_display, fh_lsdisplay_json ); + +/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + class FERRISEXP_API Ferrisls_rdf_display : public Ferrisls_long_display diff --git a/Ferris/Ferrisls_JSON.cpp b/Ferris/Ferrisls_JSON.cpp new file mode 100644 index 0000000..ce11aeb --- /dev/null +++ b/Ferris/Ferrisls_JSON.cpp @@ -0,0 +1,144 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + ferrisls client helper code. + + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: Ferrisls_XML.cpp,v 1.4 2010/09/24 21:30:50 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include "Trimming.hh" +#include "ValueRestorer.hh" +#include +#include +#include +#include + +using namespace std; + + +namespace Ferris +{ + struct Ferrisls_json_display_private + { + QVariantMap top; + std::list< QVariantMap > topstack; + QVariantMap dm; + + Ferrisls_json_display_private() + { + } + }; + + + Ferrisls_json_display::Ferrisls_json_display() + : + P( new Ferrisls_json_display_private() ) + { + } + + Ferrisls_json_display::~Ferrisls_json_display() + { + delete P; + } + + + void + Ferrisls_json_display::PrintEA( fh_context ctx, + int i, + const std::string& attr, + const std::string& EA ) + { + fh_stringstream bss; + bss << EA; + std::string ealine; + getline( bss, ealine ); + PostfixTrimmer trimmer; + trimmer.push_back( "\r" ); + string v = trimmer( ealine ); + P->dm[ attr.c_str() ] = v.c_str(); + } + + void + Ferrisls_json_display::ShowAttributes( fh_context ctx ) + { + cerr << "ShowAttributes() ctx:" << ctx->getURL() << endl; + P->dm = QVariantMap(); + _Base::ShowAttributes( ctx ); + P->top[ ctx->getDirName().c_str() ] = P->dm; + P->dm = QVariantMap(); + + // stringlist_t& an = getDefaultEAToIncludeJSON(); + // QVariantMap dm; + // contextToJSONProcessContext( ctx, dm, an, false ); + } + + void + Ferrisls_json_display::workStarting() + { + } + + void + Ferrisls_json_display::workComplete() + { + QJson::Serializer zz; + QByteArray ba = zz.serialize( P->top ); + string ret = tostr(ba); + cout << ret << flush; + } + + void + Ferrisls_json_display::EnteringContext(fh_context ctx) + { + cerr << "EnteringContext() ctx:" << ctx->getURL() << endl; + P->dm = QVariantMap(); + _Base::ShowAttributes( ctx ); + P->top[ "self" ] = P->dm; + P->topstack.push_back( P->top ); + P->top = QVariantMap(); + P->dm = QVariantMap(); + } + + void + Ferrisls_json_display::LeavingContext(fh_context ctx) + { + cerr << "LeavingContext() ctx:" << ctx->getURL() << endl; + QVariantMap t = P->top; + P->top = P->topstack.back(); + P->topstack.pop_back(); + P->top[ "children" ] = t; + P->dm = QVariantMap(); + } + + + +}; + diff --git a/Ferris/FullTextIndexerMetaInterface.cpp b/Ferris/FullTextIndexerMetaInterface.cpp index 98bf956..09d5cce 100644 --- a/Ferris/FullTextIndexerMetaInterface.cpp +++ b/Ferris/FullTextIndexerMetaInterface.cpp @@ -172,7 +172,8 @@ namespace Ferris MetaFullTextIndexerInterface::isCLuceneIndex() { string classname = getConfig( IDXMGR_INDEX_CLASS_K, "" ); - return classname == "clucene"; + cerr << "MetaFullTextIndexerInterface::isCLuceneIndex() classname:" << classname << endl; + return classname == "fulltextindexclucene"; } void* diff --git a/Ferris/General.cpp b/Ferris/General.cpp index 5bc5e00..ce8fd71 100644 --- a/Ferris/General.cpp +++ b/Ferris/General.cpp @@ -1833,5 +1833,21 @@ namespace Ferris }; + + + + PWDScope::PWDScope( const std::string& d ) + { + char buf[ PATH_MAX + 1 ]; + getwd( buf ); + m_olddir = buf; + chdir( d.c_str() ); + } + + PWDScope::~PWDScope() + { + chdir( m_olddir.c_str() ); + } + }; diff --git a/Ferris/General.hh b/Ferris/General.hh index d9f86f4..8c70caa 100644 --- a/Ferris/General.hh +++ b/Ferris/General.hh @@ -550,6 +550,12 @@ namespace Ferris }; + struct PWDScope + { + std::string m_olddir; + PWDScope( const std::string& d ); + ~PWDScope(); + }; }; #pragma GCC visibility pop diff --git a/Ferris/Makefile.am b/Ferris/Makefile.am index e0aa38e..5b30c52 100644 --- a/Ferris/Makefile.am +++ b/Ferris/Makefile.am @@ -1,8 +1,8 @@ %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # have to make these! # FerrisWebServices_private_moc.cpp FerrisQt_moc_impl.cpp @@ -53,6 +53,7 @@ INCLUDES = \ @CURL_CFLAGS@ \ @XERCES_INTERNAL_HEADERS_CFLAGS@ \ @QTNETWORK_CFLAGS@ \ + @QJSON_CFLAGS@ \ @CFLAGS@ @@ -353,6 +354,7 @@ libferris_la_SOURCES = \ Ferrisls.cpp \ Ferrisls_RDF.cpp \ Ferrisls_XML.cpp \ + Ferrisls_JSON.cpp \ Attribute.cpp \ Attribute_private.hh \ FilteredContext_private.hh \ @@ -506,6 +508,7 @@ libferris_la_LIBADD = \ @LIBSELINUX_LIBS@ \ @CURL_LIBS@ \ -lpopt \ + @QJSON_LIBS@ \ @BOOST_LIBS@ diff --git a/Ferris/Makefile.in b/Ferris/Makefile.in index 1b6c83a..07ef35d 100644 --- a/Ferris/Makefile.in +++ b/Ferris/Makefile.in @@ -87,11 +87,12 @@ am__libferris_la_SOURCES_DIST = mocimpls.cpp Ferris.cpp \ General.cpp FilteredContext.cpp Regex.cpp \ FerrisContextPlugin.cpp FerrisOpenSSL.cpp Context.cpp \ Context_private.hh FerrisPopt.cpp ContextPopt.cpp Runner.cpp \ - Ferrisls.cpp Ferrisls_RDF.cpp Ferrisls_XML.cpp Attribute.cpp \ - Attribute_private.hh FilteredContext_private.hh Resolver.cpp \ - Resolver_private.hh Math.cpp Ferrisls_AggregateData.cpp \ - ChainedViewContext.cpp FerrisOpenSSL.hh MainPageDocs.hh \ - FerrisDOM.cpp FerrisDOM_private.hh libferrisxmlshared.cpp \ + Ferrisls.cpp Ferrisls_RDF.cpp Ferrisls_XML.cpp \ + Ferrisls_JSON.cpp Attribute.cpp Attribute_private.hh \ + FilteredContext_private.hh Resolver.cpp Resolver_private.hh \ + Math.cpp Ferrisls_AggregateData.cpp ChainedViewContext.cpp \ + FerrisOpenSSL.hh MainPageDocs.hh FerrisDOM.cpp \ + FerrisDOM_private.hh libferrisxmlshared.cpp \ libferrisxmlshared.hh FerrisXalan_private.hh FerrisXalan.cpp \ xfsutil.cpp xfsutil.hh EAN.cpp FerrisBackup.cpp \ StatfsUtilities.cpp StatfsUtilities.hh FerrisCopy.cpp \ @@ -161,10 +162,11 @@ am_libferris_la_OBJECTS = mocimpls.lo Ferris.lo Image.lo Versioned.lo \ FilteredContext.lo Regex.lo FerrisContextPlugin.lo \ FerrisOpenSSL.lo Context.lo FerrisPopt.lo ContextPopt.lo \ Runner.lo Ferrisls.lo Ferrisls_RDF.lo Ferrisls_XML.lo \ - Attribute.lo Resolver.lo Math.lo Ferrisls_AggregateData.lo \ - ChainedViewContext.lo $(am__objects_1) $(am__objects_2) \ - xfsutil.lo EAN.lo FerrisBackup.lo StatfsUtilities.lo \ - FerrisCopy.lo FerrisRemove.lo LinkContextScheme.lo \ + Ferrisls_JSON.lo Attribute.lo Resolver.lo Math.lo \ + Ferrisls_AggregateData.lo ChainedViewContext.lo \ + $(am__objects_1) $(am__objects_2) xfsutil.lo EAN.lo \ + FerrisBackup.lo StatfsUtilities.lo FerrisCopy.lo \ + FerrisRemove.lo LinkContextScheme.lo \ LinkContextSchemeClients.lo FerrisMove.lo ClipAPI.lo \ CursorAPI.lo Configuration.lo FerrisVersioning.lo \ ContextIterator.lo ContextSetCompare.lo Shell.lo Mime.lo \ @@ -314,6 +316,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -322,6 +326,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -377,6 +383,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -611,6 +618,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -683,6 +691,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -694,6 +703,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -773,6 +783,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -895,6 +906,7 @@ INCLUDES = \ @CURL_CFLAGS@ \ @XERCES_INTERNAL_HEADERS_CFLAGS@ \ @QTNETWORK_CFLAGS@ \ + @QJSON_CFLAGS@ \ @CFLAGS@ @HAVE_XML4C_TRUE@XMLHH = FerrisDOM.hh @@ -1099,6 +1111,7 @@ libferris_la_SOURCES = \ Ferrisls.cpp \ Ferrisls_RDF.cpp \ Ferrisls_XML.cpp \ + Ferrisls_JSON.cpp \ Attribute.cpp \ Attribute_private.hh \ FilteredContext_private.hh \ @@ -1252,6 +1265,7 @@ libferris_la_LIBADD = \ @LIBSELINUX_LIBS@ \ @CURL_LIBS@ \ -lpopt \ + @QJSON_LIBS@ \ @BOOST_LIBS@ libferris_la_LDFLAGS = \ @@ -1418,6 +1432,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FerrisXalan.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ferrisls.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ferrisls_AggregateData.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ferrisls_JSON.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ferrisls_RDF.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ferrisls_XML.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilteredContext.Plo@am__quote@ @@ -1826,10 +1841,10 @@ uninstall-am: uninstall-ferrisincludeHEADERS uninstall-libLTLIBRARIES \ uninstall-pythonmoduleDATA %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # have to make these! # FerrisWebServices_private_moc.cpp FerrisQt_moc_impl.cpp diff --git a/FerrisGCJ/Makefile.in b/FerrisGCJ/Makefile.in index 08c9064..d06d375 100644 --- a/FerrisGCJ/Makefile.in +++ b/FerrisGCJ/Makefile.in @@ -149,6 +149,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -157,6 +159,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -212,6 +216,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -446,6 +451,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -518,6 +524,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -529,6 +536,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -608,6 +616,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/FerrisGlue/Makefile.in b/FerrisGlue/Makefile.in index 7fee980..1cd6db4 100644 --- a/FerrisGlue/Makefile.in +++ b/FerrisGlue/Makefile.in @@ -122,6 +122,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -130,6 +132,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -185,6 +189,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -419,6 +424,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -491,6 +497,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -502,6 +509,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -581,6 +589,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/FerrisQtGui/Makefile.am b/FerrisQtGui/Makefile.am index fa84f38..d09e298 100644 --- a/FerrisQtGui/Makefile.am +++ b/FerrisQtGui/Makefile.am @@ -23,10 +23,10 @@ EXTRA_DIST = $(srcdir)/*.qml ################################################################### %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: FerrisFileSystemModel_moc.cpp FerrisSortFilterProxyModel_moc.cpp modeltest_moc_impl.cpp touch mocimpls.cpp diff --git a/FerrisQtGui/Makefile.in b/FerrisQtGui/Makefile.in index e89a969..225bce3 100644 --- a/FerrisQtGui/Makefile.in +++ b/FerrisQtGui/Makefile.in @@ -159,6 +159,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -167,6 +169,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -222,6 +226,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -456,6 +461,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -528,6 +534,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -539,6 +546,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -618,6 +626,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1082,10 +1091,10 @@ uninstall-am: uninstall-ferrisqtguiincludeHEADERS \ ################################################################### %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: FerrisFileSystemModel_moc.cpp FerrisSortFilterProxyModel_moc.cpp modeltest_moc_impl.cpp touch mocimpls.cpp diff --git a/FerrisUI/Makefile.in b/FerrisUI/Makefile.in index ff0aca9..19adf29 100644 --- a/FerrisUI/Makefile.in +++ b/FerrisUI/Makefile.in @@ -154,6 +154,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -162,6 +164,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -217,6 +221,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -451,6 +456,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -523,6 +529,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -534,6 +541,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -613,6 +621,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Indexing/Makefile.in b/Indexing/Makefile.in index 854e47e..58215f0 100644 --- a/Indexing/Makefile.in +++ b/Indexing/Makefile.in @@ -125,6 +125,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -133,6 +135,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -188,6 +192,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -422,6 +427,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -494,6 +500,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -505,6 +512,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -584,6 +592,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Makefile.in b/Makefile.in index 87c592d..2b3e4a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,6 +179,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -187,6 +189,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -242,6 +246,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -476,6 +481,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -548,6 +554,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -559,6 +566,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -638,6 +646,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/Makefile.in b/ThirdParty/Makefile.in index df86fb5..bbcb5b7 100644 --- a/ThirdParty/Makefile.in +++ b/ThirdParty/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/boost/Makefile.in b/ThirdParty/boost/Makefile.in index 0faad05..19d61a8 100644 --- a/ThirdParty/boost/Makefile.in +++ b/ThirdParty/boost/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/2.7.0/Makefile.in b/ThirdParty/internal-xerces-c-headers/2.7.0/Makefile.in index c33dc7b..4724026 100644 --- a/ThirdParty/internal-xerces-c-headers/2.7.0/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/2.7.0/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile.in b/ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile.in index d767cba..7b282ce 100644 --- a/ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/2.8.0/Makefile.in b/ThirdParty/internal-xerces-c-headers/2.8.0/Makefile.in index 70bb4f7..b45afd7 100644 --- a/ThirdParty/internal-xerces-c-headers/2.8.0/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/2.8.0/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile.in b/ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile.in index 7618a21..ef76e7d 100644 --- a/ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/3.0.0/Makefile.in b/ThirdParty/internal-xerces-c-headers/3.0.0/Makefile.in index e81a071..0211fc5 100644 --- a/ThirdParty/internal-xerces-c-headers/3.0.0/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/3.0.0/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile.in b/ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile.in index 97c97d5..9899cdb 100644 --- a/ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/3.1.0/Makefile.in b/ThirdParty/internal-xerces-c-headers/3.1.0/Makefile.in index e9255a2..8da693f 100644 --- a/ThirdParty/internal-xerces-c-headers/3.1.0/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/3.1.0/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile.in b/ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile.in index b0537f4..12d4005 100644 --- a/ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ThirdParty/internal-xerces-c-headers/Makefile.in b/ThirdParty/internal-xerces-c-headers/Makefile.in index 9b7562f..fcd321d 100644 --- a/ThirdParty/internal-xerces-c-headers/Makefile.in +++ b/ThirdParty/internal-xerces-c-headers/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/Makefile.am b/apps/Makefile.am index e6a2643..6f5e348 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am @@ -38,7 +38,7 @@ SUBDIRS = \ du \ scripts \ $(UPNPDIR) \ - tools + tools rest bin_SCRIPTS = $(srcdir)/*.sh $(srcdir)/*.pl libferris-googleearth ferris-rdfproc fedit ferris-internal-extract-subtitles-to-format diff --git a/apps/Makefile.in b/apps/Makefile.in index 9934cb9..0411637 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -89,7 +89,7 @@ DIST_SUBDIRS = fileclip cat importdesktop fmkdir fmodestr2octal \ ferriscd ai namespaces cursors fca ls copy mv rm xml head tail \ fileactions ferrisredirect rdf xmmsdaemon metadataserver \ phpsearchinterface frunner volumemanager du scripts upnpserver \ - tools + tools rest DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -160,6 +160,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -168,6 +170,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -223,6 +227,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -457,6 +462,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -529,6 +535,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -540,6 +547,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -619,6 +627,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -730,7 +739,7 @@ SUBDIRS = \ du \ scripts \ $(UPNPDIR) \ - tools + tools rest bin_SCRIPTS = $(srcdir)/*.sh $(srcdir)/*.pl libferris-googleearth ferris-rdfproc fedit ferris-internal-extract-subtitles-to-format EXTRA_DIST = $(srcdir)/*.sh $(srcdir)/*.pl libferris-googleearth ferris-rdfproc fedit ferris-internal-extract-subtitles-to-format diff --git a/apps/ai/Makefile.in b/apps/ai/Makefile.in index 729c5d7..10d1615 100644 --- a/apps/ai/Makefile.in +++ b/apps/ai/Makefile.in @@ -122,6 +122,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -130,6 +132,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -185,6 +189,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -419,6 +424,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -491,6 +497,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -502,6 +509,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -581,6 +589,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/cat/Makefile.in b/apps/cat/Makefile.in index 1afc63c..831900f 100644 --- a/apps/cat/Makefile.in +++ b/apps/cat/Makefile.in @@ -122,6 +122,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -130,6 +132,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -185,6 +189,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -419,6 +424,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -491,6 +497,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -502,6 +509,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -581,6 +589,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/cat/fcat.cpp b/apps/cat/fcat.cpp index d41f11b..aecb33f 100644 --- a/apps/cat/fcat.cpp +++ b/apps/cat/fcat.cpp @@ -49,6 +49,8 @@ bash -c '/ferris/apps/cat/fcat Makefile 2>/dev/null | wc -l' #include #include +#include + using namespace std; using namespace Ferris; @@ -105,6 +107,7 @@ int main( int argc, char** argv ) unsigned long FerrisInternalAsyncMessageSlave = 0; const char* FerrisInternalAsyncMessageSlaveAttrs = 0; const char* SourceAttrName = "content"; + const char* EAIndexPath_CSTR = 0; try { @@ -143,6 +146,9 @@ int main( int argc, char** argv ) &FerrisInternalAsyncMessageSlaveAttrs, 0, "used by libferris itself to perform async queries through a slave process", "" }, + { "ea-index-path", 0, POPT_ARG_STRING, &EAIndexPath_CSTR, 0, + "which EA Index to use", "" }, + // { "target-directory", 0, POPT_ARG_STRING, &DstNameCSTR, 0, // "Specify destination explicity, all remaining URLs are assumed to be source files", @@ -171,6 +177,11 @@ int main( int argc, char** argv ) exit(1); } + if( EAIndexPath_CSTR ) + { + ::Ferris::EAIndex::Factory::setDefaultEAIndexPath( EAIndexPath_CSTR ); + } + stringlist_t srcs; srcs = expandShellGlobs( srcs, optCon ); diff --git a/apps/copy/Makefile.in b/apps/copy/Makefile.in index fb90023..b307d3a 100644 --- a/apps/copy/Makefile.in +++ b/apps/copy/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/cursors/Makefile.in b/apps/cursors/Makefile.in index ec37ff7..c1a9677 100644 --- a/apps/cursors/Makefile.in +++ b/apps/cursors/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/du/Makefile.in b/apps/du/Makefile.in index 5a1f4f5..4033397 100644 --- a/apps/du/Makefile.in +++ b/apps/du/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fca/Makefile.in b/apps/fca/Makefile.in index f80c887..1745103 100644 --- a/apps/fca/Makefile.in +++ b/apps/fca/Makefile.in @@ -245,6 +245,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -253,6 +255,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -308,6 +312,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -542,6 +547,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -614,6 +620,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -625,6 +632,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -704,6 +712,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fcompress/Makefile.in b/apps/fcompress/Makefile.in index 68eec81..27654f7 100644 --- a/apps/fcompress/Makefile.in +++ b/apps/fcompress/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/ferriscd/Makefile.in b/apps/ferriscd/Makefile.in index 1dd2618..e2002d3 100644 --- a/apps/ferriscd/Makefile.in +++ b/apps/ferriscd/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/ferrisredirect/Makefile.in b/apps/ferrisredirect/Makefile.in index 6340218..9aa295d 100644 --- a/apps/ferrisredirect/Makefile.in +++ b/apps/ferrisredirect/Makefile.in @@ -145,6 +145,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -153,6 +155,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -208,6 +212,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -442,6 +447,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -514,6 +520,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -525,6 +532,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -604,6 +612,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileactions/Makefile.in b/apps/fileactions/Makefile.in index ccbceb0..5220875 100644 --- a/apps/fileactions/Makefile.in +++ b/apps/fileactions/Makefile.in @@ -121,6 +121,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -129,6 +131,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -184,6 +188,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -418,6 +423,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -490,6 +496,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -501,6 +508,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -580,6 +588,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/Makefile.in b/apps/fileclip/Makefile.in index b2a8b6e..cf744be 100644 --- a/apps/fileclip/Makefile.in +++ b/apps/fileclip/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fclipcopy/Makefile.in b/apps/fileclip/fclipcopy/Makefile.in index 3db970e..eb6bcfd 100644 --- a/apps/fileclip/fclipcopy/Makefile.in +++ b/apps/fileclip/fclipcopy/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fclipcut/Makefile.in b/apps/fileclip/fclipcut/Makefile.in index 6bda3c6..34de167 100644 --- a/apps/fileclip/fclipcut/Makefile.in +++ b/apps/fileclip/fclipcut/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fcliplink/Makefile.in b/apps/fileclip/fcliplink/Makefile.in index 7ff7f69..94031e2 100644 --- a/apps/fileclip/fcliplink/Makefile.in +++ b/apps/fileclip/fcliplink/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fclippaste/Makefile.in b/apps/fileclip/fclippaste/Makefile.in index c0cc258..ab011b4 100644 --- a/apps/fileclip/fclippaste/Makefile.in +++ b/apps/fileclip/fclippaste/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fclipredo/Makefile.in b/apps/fileclip/fclipredo/Makefile.in index 077c4df..de4c768 100644 --- a/apps/fileclip/fclipredo/Makefile.in +++ b/apps/fileclip/fclipredo/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fileclip/fclipundo/Makefile.in b/apps/fileclip/fclipundo/Makefile.in index b4668cd..6598ff2 100644 --- a/apps/fileclip/fclipundo/Makefile.in +++ b/apps/fileclip/fclipundo/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fmedallion/Makefile.in b/apps/fmedallion/Makefile.in index 3626598..cfe115c 100644 --- a/apps/fmedallion/Makefile.in +++ b/apps/fmedallion/Makefile.in @@ -128,6 +128,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -136,6 +138,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -191,6 +195,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -425,6 +430,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -497,6 +503,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -508,6 +515,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -587,6 +595,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fmkdir/Makefile.in b/apps/fmkdir/Makefile.in index 77507f6..b0f2f31 100644 --- a/apps/fmkdir/Makefile.in +++ b/apps/fmkdir/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fmodestr2octal/Makefile.in b/apps/fmodestr2octal/Makefile.in index 4dd0f79..acc76a8 100644 --- a/apps/fmodestr2octal/Makefile.in +++ b/apps/fmodestr2octal/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/frunner/Makefile.in b/apps/frunner/Makefile.in index 61b0a82..e0589fa 100644 --- a/apps/frunner/Makefile.in +++ b/apps/frunner/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fschema/Makefile.in b/apps/fschema/Makefile.in index ba63d69..a4fa0c1 100644 --- a/apps/fschema/Makefile.in +++ b/apps/fschema/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/ftouch/Makefile.in b/apps/ftouch/Makefile.in index 827021e..fdb7038 100644 --- a/apps/ftouch/Makefile.in +++ b/apps/ftouch/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/fulltextindex/Makefile.in b/apps/fulltextindex/Makefile.in index 0f30b3d..759acf9 100644 --- a/apps/fulltextindex/Makefile.in +++ b/apps/fulltextindex/Makefile.in @@ -272,6 +272,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -280,6 +282,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -335,6 +339,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -569,6 +574,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -641,6 +647,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -652,6 +659,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -731,6 +739,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/head/Makefile.in b/apps/head/Makefile.in index f6d1a50..e95eeb2 100644 --- a/apps/head/Makefile.in +++ b/apps/head/Makefile.in @@ -113,6 +113,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -121,6 +123,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -176,6 +180,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -410,6 +415,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -482,6 +488,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -493,6 +500,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -572,6 +580,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/importdesktop/Makefile.in b/apps/importdesktop/Makefile.in index fd0541a..36c9984 100644 --- a/apps/importdesktop/Makefile.in +++ b/apps/importdesktop/Makefile.in @@ -180,6 +180,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -188,6 +190,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -243,6 +247,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -477,6 +482,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -549,6 +555,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -560,6 +567,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -639,6 +647,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/importdesktop/dot-desktop-files/Graphics/Makefile.in b/apps/importdesktop/dot-desktop-files/Graphics/Makefile.in index 9a81dd0..3a6f8f1 100644 --- a/apps/importdesktop/dot-desktop-files/Graphics/Makefile.in +++ b/apps/importdesktop/dot-desktop-files/Graphics/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/importdesktop/dot-desktop-files/Makefile.in b/apps/importdesktop/dot-desktop-files/Makefile.in index 883c578..933110a 100644 --- a/apps/importdesktop/dot-desktop-files/Makefile.in +++ b/apps/importdesktop/dot-desktop-files/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/importdesktop/dot-desktop-files/Multimedia/Makefile.in b/apps/importdesktop/dot-desktop-files/Multimedia/Makefile.in index 0ba7404..01b9922 100644 --- a/apps/importdesktop/dot-desktop-files/Multimedia/Makefile.in +++ b/apps/importdesktop/dot-desktop-files/Multimedia/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/ls/Makefile.in b/apps/ls/Makefile.in index eda113c..0645a2a 100644 --- a/apps/ls/Makefile.in +++ b/apps/ls/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/ls/ls.cpp b/apps/ls/ls.cpp index f63baca..8969f51 100644 --- a/apps/ls/ls.cpp +++ b/apps/ls/ls.cpp @@ -201,6 +201,7 @@ int main( int argc, const char** argv ) unsigned long XMLListElements = 0; unsigned long XMLListRAW = 0; unsigned long XMLListXSLTFSDebug = 0; + unsigned long JSONList = 0; unsigned long RDFList = 0; unsigned long DiredList = 0; unsigned long CSVList = 0; @@ -342,6 +343,9 @@ int main( int argc, const char** argv ) { "xmle", '4', POPT_ARG_NONE, &XMLListElements, 0, "Show output as XML with full data in elements", 0 }, + { "json", '5', POPT_ARG_NONE, &JSONList, 0, + "Show output as JSON", 0 }, + { "xmlraw", 0, POPT_ARG_NONE, &XMLListRAW, 0, "Show output as XML using specialized adhoc serialization", 0 }, @@ -622,6 +626,10 @@ int main( int argc, const char** argv ) { XMLList = 1; } + else if( s == "json" ) + { + JSONList = 1; + } else if( s == "xmle" ) { XMLListElements = 1; @@ -935,6 +943,24 @@ int main( int argc, const char** argv ) FieldSeperator = ", "; RecordSeperator = ""; } + else if( JSONList ) + { + fh_lsdisplay_json ld = new Ferrisls_json_display(); + d = ld; + + ld->setColumns( ShowColumns ); + ColumnsWidths = ""; + RecordSeperator = ""; + FieldSeperator = ""; + + if( AppendShowColumnsRegexCSTR ) + { + string AppendShowColumnsRegex = AppendShowColumnsRegexCSTR; + ld->appendShowColumnsRegex( AppendShowColumnsRegex ); + } + if( OutputPrecision ) + ld->setOutputPrecision( OutputPrecision ); + } else if( XMLList ) { fh_lsdisplay_xml ld = new Ferrisls_xml_display(); diff --git a/apps/metadataserver/Makefile.am b/apps/metadataserver/Makefile.am index 23280fd..fd4c2fe 100644 --- a/apps/metadataserver/Makefile.am +++ b/apps/metadataserver/Makefile.am @@ -11,16 +11,16 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp ferris-internal-metadata-broker.moc: ferris-internal-metadata-broker.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc + $(MOC) $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc ferris-internal-metadata-worker.moc: ferris-internal-metadata-worker.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc + $(MOC) $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc ferris-internal-metadata-broker-direct-client.moc: ferris-internal-metadata-broker-direct-client.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc + $(MOC) $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc metadata-clients-common.moc: metadata-clients-common.cpp - moc-qt4 $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc + $(MOC) $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc INCLUDES = \ @STLPORT_CFLAGS@ \ diff --git a/apps/metadataserver/Makefile.in b/apps/metadataserver/Makefile.in index e55f0d4..bfdd15c 100644 --- a/apps/metadataserver/Makefile.in +++ b/apps/metadataserver/Makefile.in @@ -184,6 +184,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -192,6 +194,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -247,6 +251,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -481,6 +486,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -553,6 +559,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -564,6 +571,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -643,6 +651,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1093,16 +1102,16 @@ uninstall-am: uninstall-binPROGRAMS @HAVE_QTDBUS_TRUE@mocimpls.cpp: $(MOC_DEP_SRCS) @HAVE_QTDBUS_TRUE@ touch mocimpls.cpp @HAVE_QTDBUS_TRUE@ferris-internal-metadata-broker.moc: ferris-internal-metadata-broker.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc +@HAVE_QTDBUS_TRUE@ $(MOC) $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc @HAVE_QTDBUS_TRUE@ferris-internal-metadata-worker.moc: ferris-internal-metadata-worker.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc +@HAVE_QTDBUS_TRUE@ $(MOC) $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc @HAVE_QTDBUS_TRUE@ferris-internal-metadata-broker-direct-client.moc: ferris-internal-metadata-broker-direct-client.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc +@HAVE_QTDBUS_TRUE@ $(MOC) $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc @HAVE_QTDBUS_TRUE@metadata-clients-common.moc: metadata-clients-common.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc +@HAVE_QTDBUS_TRUE@ $(MOC) $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc # 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 --git a/apps/mv/Makefile.in b/apps/mv/Makefile.in index baa7c74..cf91675 100644 --- a/apps/mv/Makefile.in +++ b/apps/mv/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/namespaces/Makefile.in b/apps/namespaces/Makefile.in index 1b12b31..f51becb 100644 --- a/apps/namespaces/Makefile.in +++ b/apps/namespaces/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/oprocdeamon/Makefile.in b/apps/oprocdeamon/Makefile.in index ec602f4..59c00f9 100644 --- a/apps/oprocdeamon/Makefile.in +++ b/apps/oprocdeamon/Makefile.in @@ -120,6 +120,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -128,6 +130,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -183,6 +187,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -417,6 +422,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -489,6 +495,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -500,6 +507,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -579,6 +587,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/oprocdeamon/ferris-out-of-proc-notification-deamon.cpp b/apps/oprocdeamon/ferris-out-of-proc-notification-deamon.cpp index d596350..c177e50 100644 --- a/apps/oprocdeamon/ferris-out-of-proc-notification-deamon.cpp +++ b/apps/oprocdeamon/ferris-out-of-proc-notification-deamon.cpp @@ -77,7 +77,7 @@ void writePID( pid_t pid = 0 ) stringstream ss; ss << pid; string path = TargetDir + "/pid"; - int fd = open( path.c_str(), O_WRONLY | O_CREAT | O_TRUNC ); + int fd = open( path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0777 ); write( fd, ss.str().c_str(), ss.str().length() ); close( fd ); diff --git a/apps/phpsearchinterface/Makefile.in b/apps/phpsearchinterface/Makefile.in index 78c2a57..fd41651 100644 --- a/apps/phpsearchinterface/Makefile.in +++ b/apps/phpsearchinterface/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/phpsearchinterface/dhtmlxSuite/Makefile.in b/apps/phpsearchinterface/dhtmlxSuite/Makefile.in index 638e56e..fcb1a66 100644 --- a/apps/phpsearchinterface/dhtmlxSuite/Makefile.in +++ b/apps/phpsearchinterface/dhtmlxSuite/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/rdf/Makefile.in b/apps/rdf/Makefile.in index 14cc8b2..c599d53 100644 --- a/apps/rdf/Makefile.in +++ b/apps/rdf/Makefile.in @@ -169,6 +169,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -177,6 +179,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -232,6 +236,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -466,6 +471,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -538,6 +544,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -549,6 +556,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -628,6 +636,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/rest/Makefile.am b/apps/rest/Makefile.am new file mode 100644 index 0000000..e2e2416 --- /dev/null +++ b/apps/rest/Makefile.am @@ -0,0 +1,25 @@ +# A list of all the files in the current directory which can be regenerated +MAINTAINERCLEANFILES = Makefile.in + + +if FERRIS_HAVE_CGICC + +cgibindir = /var/www/cgi-bin/ferris +cgibin_PROGRAMS = rest + +INCLUDES = \ + @STLPORT_CFLAGS@ \ + -I. \ + -I$(srcdir) -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(includedir) \ + -I/usr/local/include \ + @CFLAGS@ + +rest_SOURCES = rest.cpp +rest_LDADD = -lm -lpopt +rest_LDFLAGS = @LIBFERRIS_LA@ \ + -L/usr/lib -lcgicc + + +endif diff --git a/apps/rest/Makefile.in b/apps/rest/Makefile.in new file mode 100644 index 0000000..c7e07bb --- /dev/null +++ b/apps/rest/Makefile.in @@ -0,0 +1,1005 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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 = : +build_triplet = @build@ +host_triplet = @host@ +@FERRIS_HAVE_CGICC_TRUE@cgibin_PROGRAMS = rest$(EXEEXT) +subdir = apps/rest +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/ferrismacros.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(cgibindir)" +PROGRAMS = $(cgibin_PROGRAMS) +am__rest_SOURCES_DIST = rest.cpp +@FERRIS_HAVE_CGICC_TRUE@am_rest_OBJECTS = rest.$(OBJEXT) +rest_OBJECTS = $(am_rest_OBJECTS) +rest_DEPENDENCIES = +rest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(rest_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(rest_SOURCES) +DIST_SOURCES = $(am__rest_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +ANNODEX_CFLAGS = @ANNODEX_CFLAGS@ +ANNODEX_LIBS = @ANNODEX_LIBS@ +ANTLR = @ANTLR@ +ANTLR_H = @ANTLR_H@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BEAGLE_CFLAGS = @BEAGLE_CFLAGS@ +BEAGLE_LIBS = @BEAGLE_LIBS@ +BONOBO_CFLAGS = @BONOBO_CFLAGS@ +BONOBO_LIBS = @BONOBO_LIBS@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ +BZIP2_CFLAGS = @BZIP2_CFLAGS@ +BZIP2_LIBS = @BZIP2_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CGICC_CFLAGS = @CGICC_CFLAGS@ +CGICC_LIBS = @CGICC_LIBS@ +CLIENTUI_APP_CFLAGS = @CLIENTUI_APP_CFLAGS@ +CLIENTUI_APP_LIBS = @CLIENTUI_APP_LIBS@ +CLIENTXSLT_APP_CFLAGS = @CLIENTXSLT_APP_CFLAGS@ +CLIENTXSLT_APP_LIBS = @CLIENTXSLT_APP_LIBS@ +CLIENT_APP_CFLAGS = @CLIENT_APP_CFLAGS@ +CLIENT_APP_LIBS = @CLIENT_APP_LIBS@ +CLUCENE_CFLAGS = @CLUCENE_CFLAGS@ +CLUCENE_LIBS = @CLUCENE_LIBS@ +CMML_CFLAGS = @CMML_CFLAGS@ +CMML_LIBS = @CMML_LIBS@ +COMMONDBDIR = @COMMONDBDIR@ +COMMONDB_LA = @COMMONDB_LA@ +COMMONSQLDBDIR = @COMMONSQLDBDIR@ +COMMONSQLDBDIR_LA = @COMMONSQLDBDIR_LA@ +COMPILE_SYMBOLS_AS_PUBLIC = @COMPILE_SYMBOLS_AS_PUBLIC@ +CONTEXT_PLUGIN_CFLAGS = @CONTEXT_PLUGIN_CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ +CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ +CTXGOOGLEDIR = @CTXGOOGLEDIR@ +CTXGOOGLE_LA = @CTXGOOGLE_LA@ +CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ +CTXGSTREAMER_LA = @CTXGSTREAMER_LA@ +CTXIDENTICADIR = @CTXIDENTICADIR@ +CTXIDENTICA_LA = @CTXIDENTICA_LA@ +CTXVIMEODIR = @CTXVIMEODIR@ +CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ +CURL_CFLAGS = @CURL_CFLAGS@ +CURL_LIBS = @CURL_LIBS@ +CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXCPPFLAGS = @CXXCPPFLAGS@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DB4_CFLAGS = @DB4_CFLAGS@ +DB4_LIBS = @DB4_LIBS@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBXML_CFLAGS = @DBXML_CFLAGS@ +DBXML_LIBS = @DBXML_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DESKTOP_FILE_DIR = @DESKTOP_FILE_DIR@ +DLG = @DLG@ +DLLTOOL = @DLLTOOL@ +DOTFILE_ETC = @DOTFILE_ETC@ +DSYMUTIL = @DSYMUTIL@ +DTLMODDIR = @DTLMODDIR@ +DTL_CFLAGS = @DTL_CFLAGS@ +DTL_LIBS = @DTL_LIBS@ +DUMPBIN = @DUMPBIN@ +DVDREAD_CFLAGS = @DVDREAD_CFLAGS@ +DVDREAD_LIBS = @DVDREAD_LIBS@ +EAIDXCUSTOMFERRISDB4TREE_LA = @EAIDXCUSTOMFERRISDB4TREE_LA@ +EAIDXCUSTOMFERRISDIR = @EAIDXCUSTOMFERRISDIR@ +EAIDXCUSTOMFERRIS_LA = @EAIDXCUSTOMFERRIS_LA@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +ECORE_CFLAGS = @ECORE_CFLAGS@ +ECORE_LIBS = @ECORE_LIBS@ +EDB_CFLAGS = @EDB_CFLAGS@ +EDB_LIBS = @EDB_LIBS@ +EET_CFLAGS = @EET_CFLAGS@ +EET_LIBS = @EET_LIBS@ +EFSD_CFLAGS = @EFSD_CFLAGS@ +EFSD_LIBS = @EFSD_LIBS@ +EGREP = @EGREP@ +EMACS_GNUCLIENT_PATH = @EMACS_GNUCLIENT_PATH@ +EMACS_MOUNT_CFLAGS = @EMACS_MOUNT_CFLAGS@ +EMACS_MOUNT_LIBS = @EMACS_MOUNT_LIBS@ +EPEG_CFLAGS = @EPEG_CFLAGS@ +EPEG_LIBS = @EPEG_LIBS@ +EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE = @EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE@ +EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@ +EVOLUTION_LIBS = @EVOLUTION_LIBS@ +EXEEXT = @EXEEXT@ +FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ +FAMPP2_LIBS = @FAMPP2_LIBS@ +FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ +FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ +FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ +FERRIS_IOSIZE = @FERRIS_IOSIZE@ +FERRIS_IOSIZE_WARNING = @FERRIS_IOSIZE_WARNING@ +FERRIS_MODULE_COMPILE_LIST = @FERRIS_MODULE_COMPILE_LIST@ +FERRIS_SMARTPTR_ASSERT = @FERRIS_SMARTPTR_ASSERT@ +FERRIS_VERSION = @FERRIS_VERSION@ +FGREP = @FGREP@ +FIREFOX_MOUNT_CFLAGS = @FIREFOX_MOUNT_CFLAGS@ +FIREFOX_MOUNT_LIBS = @FIREFOX_MOUNT_LIBS@ +FLAC_CFLAGS = @FLAC_CFLAGS@ +FLAC_LIBS = @FLAC_LIBS@ +FSPOT_CFLAGS = @FSPOT_CFLAGS@ +FSPOT_LIBS = @FSPOT_LIBS@ +FSTREAM_CFLAGS = @FSTREAM_CFLAGS@ +FSTREAM_LIBS = @FSTREAM_LIBS@ +FTXIDXCUSTOMFERRISDIR = @FTXIDXCUSTOMFERRISDIR@ +FTXIDXCUSTOMFERRIS_LA = @FTXIDXCUSTOMFERRIS_LA@ +FTXIDXLUCENEANALYZERDIR = @FTXIDXLUCENEANALYZERDIR@ +FTXIDXLUCENEANALYZER_LA = @FTXIDXLUCENEANALYZER_LA@ +FXD_BINARY = @FXD_BINARY@ +FXD_BINARY_A52PIPE = @FXD_BINARY_A52PIPE@ +FXD_BINARY_NATIVE_EA = @FXD_BINARY_NATIVE_EA@ +FXD_BINARY_PGMPIPE = @FXD_BINARY_PGMPIPE@ +FXD_BINARY_RGBA32 = @FXD_BINARY_RGBA32@ +FXD_CIPHER_BITS = @FXD_CIPHER_BITS@ +FXD_CIPHER_NAME = @FXD_CIPHER_NAME@ +FXD_CIPHER_NAME_LIST = @FXD_CIPHER_NAME_LIST@ +FXD_CIPHER_VERSION = @FXD_CIPHER_VERSION@ +FXD_DIGEST = @FXD_DIGEST@ +FXD_DISTINGUISHED_PERSON = @FXD_DISTINGUISHED_PERSON@ +FXD_EANAMES = @FXD_EANAMES@ +FXD_ENUMERATED_STRING = @FXD_ENUMERATED_STRING@ +FXD_EXIF_COMPRESSION = @FXD_EXIF_COMPRESSION@ +FXD_EXIF_COPYRIGHT = @FXD_EXIF_COPYRIGHT@ +FXD_EXIF_DATETIME_STRING = @FXD_EXIF_DATETIME_STRING@ +FXD_EXIF_EXPOSURE_PROGRAM = @FXD_EXIF_EXPOSURE_PROGRAM@ +FXD_EXIF_FLASH = @FXD_EXIF_FLASH@ +FXD_EXIF_LIGHT_SOURCE = @FXD_EXIF_LIGHT_SOURCE@ +FXD_EXIF_METERING_MODE = @FXD_EXIF_METERING_MODE@ +FXD_EXIF_ORIENTATION = @FXD_EXIF_ORIENTATION@ +FXD_EXIF_SENSING_METHOD = @FXD_EXIF_SENSING_METHOD@ +FXD_EXIF_USER_COMMENT = @FXD_EXIF_USER_COMMENT@ +FXD_EXIF_VERSION = @FXD_EXIF_VERSION@ +FXD_EXIF_YCBCR_POSITIONING = @FXD_EXIF_YCBCR_POSITIONING@ +FXD_FFILTER = @FXD_FFILTER@ +FXD_FILESIZE = @FXD_FILESIZE@ +FXD_FSID_T = @FXD_FSID_T@ +FXD_FTX_RANK = @FXD_FTX_RANK@ +FXD_GID_T = @FXD_GID_T@ +FXD_GROUPNAME = @FXD_GROUPNAME@ +FXD_HEIGHT_PIXELS = @FXD_HEIGHT_PIXELS@ +FXD_INODE_T = @FXD_INODE_T@ +FXD_INT32 = @FXD_INT32@ +FXD_INT64 = @FXD_INT64@ +FXD_INTLIST = @FXD_INTLIST@ +FXD_IP4PORT = @FXD_IP4PORT@ +FXD_LATITUDE = @FXD_LATITUDE@ +FXD_LATLONG = @FXD_LATLONG@ +FXD_LONG = @FXD_LONG@ +FXD_LONGITUDE = @FXD_LONGITUDE@ +FXD_MACHINE_NAME = @FXD_MACHINE_NAME@ +FXD_MIMETYPE = @FXD_MIMETYPE@ +FXD_MODE_STRING_T = @FXD_MODE_STRING_T@ +FXD_MODE_T = @FXD_MODE_T@ +FXD_PID = @FXD_PID@ +FXD_PIXELCOUNT = @FXD_PIXELCOUNT@ +FXD_PRIMARY_KEY = @FXD_PRIMARY_KEY@ +FXD_PRIMARY_KEY_REAL = @FXD_PRIMARY_KEY_REAL@ +FXD_PRIMARY_KEY_VIRTUAL = @FXD_PRIMARY_KEY_VIRTUAL@ +FXD_STRINGLIST = @FXD_STRINGLIST@ +FXD_STR_IP4ADDR = @FXD_STR_IP4ADDR@ +FXD_UID_T = @FXD_UID_T@ +FXD_UINT32 = @FXD_UINT32@ +FXD_UINT64 = @FXD_UINT64@ +FXD_UNIT_NAME_LENGTH = @FXD_UNIT_NAME_LENGTH@ +FXD_UNIXEPOCH_STRING = @FXD_UNIXEPOCH_STRING@ +FXD_UNIXEPOCH_T = @FXD_UNIXEPOCH_T@ +FXD_URL = @FXD_URL@ +FXD_URLLIST = @FXD_URLLIST@ +FXD_URL_IMPLICIT_RESOLVE = @FXD_URL_IMPLICIT_RESOLVE@ +FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM = @FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM@ +FXD_USERNAME = @FXD_USERNAME@ +FXD_WIDTH_PIXELS = @FXD_WIDTH_PIXELS@ +FXD_XLIST = @FXD_XLIST@ +FXD_XMLDOCSTRING = @FXD_XMLDOCSTRING@ +GCJ = @GCJ@ +GCJDEPMODE = @GCJDEPMODE@ +GCJFLAGS = @GCJFLAGS@ +GCJLUCENE_CFLAGS = @GCJLUCENE_CFLAGS@ +GCJLUCENE_GCJFLAGS = @GCJLUCENE_GCJFLAGS@ +GCJLUCENE_LIBS = @GCJLUCENE_LIBS@ +GCJ_CFLAGS = @GCJ_CFLAGS@ +GCJ_LIBS = @GCJ_LIBS@ +GDBM_CFLAGS = @GDBM_CFLAGS@ +GDBM_LIBS = @GDBM_LIBS@ +GIMP_MP_FLAGS = @GIMP_MP_FLAGS@ +GIMP_MP_LIBS = @GIMP_MP_LIBS@ +GIMP_THREAD_FLAGS = @GIMP_THREAD_FLAGS@ +GIMP_THREAD_LIBS = @GIMP_THREAD_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@ +GPHOTO2_CONFIG = @GPHOTO2_CONFIG@ +GPHOTO2_LIBS = @GPHOTO2_LIBS@ +GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTKEXTRA2_CFLAGS = @GTKEXTRA2_CFLAGS@ +GTKEXTRA2_LIBS = @GTKEXTRA2_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +ID3_CFLAGS = @ID3_CFLAGS@ +ID3_LIBS = @ID3_LIBS@ +IMLIB_CFLAGS = @IMLIB_CFLAGS@ +IMLIB_LIBS = @IMLIB_LIBS@ +INCLUDEDIR = @INCLUDEDIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IOSIZE = @IOSIZE@ +IPC_CONTEXT_CFLAGS = @IPC_CONTEXT_CFLAGS@ +IPC_CONTEXT_LIBS = @IPC_CONTEXT_LIBS@ +KDE_CFLAGS = @KDE_CFLAGS@ +KDE_EAGENERATOR_CFLAGS = @KDE_EAGENERATOR_CFLAGS@ +KDE_EAGENERATOR_LIBS = @KDE_EAGENERATOR_LIBS@ +KDE_LIBS = @KDE_LIBS@ +KSANE_CFLAGS = @KSANE_CFLAGS@ +KSANE_LIBS = @KSANE_LIBS@ +LD = @LD@ +LDAPMODDIR = @LDAPMODDIR@ +LDAP_CFLAGS = @LDAP_CFLAGS@ +LDAP_LIBS = @LDAP_LIBS@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_APP = @LDFLAGS_APP@ +LIBA52_CFLAGS = @LIBA52_CFLAGS@ +LIBA52_LIBS = @LIBA52_LIBS@ +LIBAMAROK_CFLAGS = @LIBAMAROK_CFLAGS@ +LIBAMAROK_LIBS = @LIBAMAROK_LIBS@ +LIBASTEXT_PLUGIN_FACTORIES_LA = @LIBASTEXT_PLUGIN_FACTORIES_LA@ +LIBATTR_CFLAGS = @LIBATTR_CFLAGS@ +LIBATTR_LIBS = @LIBATTR_LIBS@ +LIBBTPARSE_CFLAGS = @LIBBTPARSE_CFLAGS@ +LIBBTPARSE_LIBS = @LIBBTPARSE_LIBS@ +LIBCAP_CFLAGS = @LIBCAP_CFLAGS@ +LIBCAP_LIBS = @LIBCAP_LIBS@ +LIBCREATION_PLUGIN_FACTORIES_LA = @LIBCREATION_PLUGIN_FACTORIES_LA@ +LIBDIR = @LIBDIR@ +LIBDJVULIBRE_CFLAGS = @LIBDJVULIBRE_CFLAGS@ +LIBDJVULIBRE_LIBS = @LIBDJVULIBRE_LIBS@ +LIBEAGEN_PLUGIN_FACTORIES_LA = @LIBEAGEN_PLUGIN_FACTORIES_LA@ +LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@ +LIBEXIF_LIBS = @LIBEXIF_LIBS@ +LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@ +LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@ +LIBFERRISINDEXING_LA = @LIBFERRISINDEXING_LA@ +LIBFERRISMG_LA = @LIBFERRISMG_LA@ +LIBFERRISQTGUI_LA = @LIBFERRISQTGUI_LA@ +LIBFERRISUI_LA = @LIBFERRISUI_LA@ +LIBFERRISXSLT_LA = @LIBFERRISXSLT_LA@ +LIBFERRIS_ASTEXTPLUGIN_LT_LINE = @LIBFERRIS_ASTEXTPLUGIN_LT_LINE@ +LIBFERRIS_BETA = @LIBFERRIS_BETA@ +LIBFERRIS_CREATIONPLUGIN_LT_LINE = @LIBFERRIS_CREATIONPLUGIN_LT_LINE@ +LIBFERRIS_EAPLUGIN_LT_LINE = @LIBFERRIS_EAPLUGIN_LT_LINE@ +LIBFERRIS_FULLV = @LIBFERRIS_FULLV@ +LIBFERRIS_LA = @LIBFERRIS_LA@ +LIBFERRIS_LT_AGE = @LIBFERRIS_LT_AGE@ +LIBFERRIS_LT_CURRENT = @LIBFERRIS_LT_CURRENT@ +LIBFERRIS_LT_REVISION = @LIBFERRIS_LT_REVISION@ +LIBFERRIS_MAJOR = @LIBFERRIS_MAJOR@ +LIBFERRIS_MINOR = @LIBFERRIS_MINOR@ +LIBFERRIS_PLUGIN_FACTORY_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD@ +LIBFERRIS_PLUGIN_LIBADD = @LIBFERRIS_PLUGIN_LIBADD@ +LIBFERRIS_PLUGIN_LT_LINE = @LIBFERRIS_PLUGIN_LT_LINE@ +LIBFILE_CFLAGS = @LIBFILE_CFLAGS@ +LIBFILE_LIBS = @LIBFILE_LIBS@ +LIBGISTMIQ_CFLAGS = @LIBGISTMIQ_CFLAGS@ +LIBGISTMIQ_LIBS = @LIBGISTMIQ_LIBS@ +LIBIMAGEMAGICKNAMESPACEGLUE_LA = @LIBIMAGEMAGICKNAMESPACEGLUE_LA@ +LIBJASPER_CFLAGS = @LIBJASPER_CFLAGS@ +LIBJASPER_LIBS = @LIBJASPER_LIBS@ +LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@ +LIBJPEG_LIBS = @LIBJPEG_LIBS@ +LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@ +LIBMAGIC_LIBS = @LIBMAGIC_LIBS@ +LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@ +LIBMPEG3_LIBS = @LIBMPEG3_LIBS@ +LIBMPG2_CFLAGS = @LIBMPG2_CFLAGS@ +LIBMPG2_LIBS = @LIBMPG2_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBPLATINUM_CFLAGS = @LIBPLATINUM_CFLAGS@ +LIBPLATINUM_LIBS = @LIBPLATINUM_LIBS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPQXX_CFLAGS = @LIBPQXX_CFLAGS@ +LIBPQXX_LIBS = @LIBPQXX_LIBS@ +LIBRPM_CFLAGS = @LIBRPM_CFLAGS@ +LIBRPM_LIBS = @LIBRPM_LIBS@ +LIBS = @LIBS@ +LIBSELINUX_CFLAGS = @LIBSELINUX_CFLAGS@ +LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ +LIBTEXTCAT_CFLAGS = @LIBTEXTCAT_CFLAGS@ +LIBTEXTCAT_LIBS = @LIBTEXTCAT_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXMMS_CFLAGS = @LIBXMMS_CFLAGS@ +LIBXMMS_LIBS = @LIBXMMS_LIBS@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOKI_CFLAGS = @LOKI_CFLAGS@ +LOKI_LIBS = @LOKI_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +LT_RELEASE = @LT_RELEASE@ +MAGICK_CFLAGS = @MAGICK_CFLAGS@ +MAGICK_LIBS = @MAGICK_LIBS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ +MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ +MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ +MKDIR_P = @MKDIR_P@ +MOC = @MOC@ +MP3_CFLAGS = @MP3_CFLAGS@ +MP3_LIBS = @MP3_LIBS@ +NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ +NEPOMUK_LIBS = @NEPOMUK_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBBYMODDIR = @OBBYMODDIR@ +OBBY_CFLAGS = @OBBY_CFLAGS@ +OBBY_LIBS = @OBBY_LIBS@ +OBBY_MOUNT_CFLAGS = @OBBY_MOUNT_CFLAGS@ +OBBY_MOUNT_LIBS = @OBBY_MOUNT_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OGGZ_CFLAGS = @OGGZ_CFLAGS@ +OGGZ_LIBS = @OGGZ_LIBS@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PASTEBINDIR = @PASTEBINDIR@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PCCTS_CFLAGS = @PCCTS_CFLAGS@ +PGCTXMODDIR = @PGCTXMODDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLASMA_CFLAGS = @PLASMA_CFLAGS@ +PLASMA_LIBS = @PLASMA_LIBS@ +PREFIX = @PREFIX@ +PREFIXSTR = @PREFIXSTR@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +QJSON_CFLAGS = @QJSON_CFLAGS@ +QJSON_LIBS = @QJSON_LIBS@ +QOAUTH_CFLAGS = @QOAUTH_CFLAGS@ +QOAUTH_LIBS = @QOAUTH_LIBS@ +QPRINTER_CFLAGS = @QPRINTER_CFLAGS@ +QPRINTER_LIBS = @QPRINTER_LIBS@ +QTCORE_CFLAGS = @QTCORE_CFLAGS@ +QTCORE_LIBS = @QTCORE_LIBS@ +QTDBUS_CFLAGS = @QTDBUS_CFLAGS@ +QTDBUS_LIBS = @QTDBUS_LIBS@ +QTGUI_CFLAGS = @QTGUI_CFLAGS@ +QTGUI_LIBS = @QTGUI_LIBS@ +QTNETWORK_CFLAGS = @QTNETWORK_CFLAGS@ +QTNETWORK_LIBS = @QTNETWORK_LIBS@ +QTSQLCTXMODDIR = @QTSQLCTXMODDIR@ +QTSQL_CFLAGS = @QTSQL_CFLAGS@ +QTSQL_LIBS = @QTSQL_LIBS@ +QT_CFLAGS = @QT_CFLAGS@ +QT_CXXFLAGS = @QT_CXXFLAGS@ +QT_LDADD = @QT_LDADD@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +REQUIREMENTS = @REQUIREMENTS@ +REQUIREMENTSUI = @REQUIREMENTSUI@ +REQUIREMENTSXSLT = @REQUIREMENTSXSLT@ +RPM_BUILD_ROOT = @RPM_BUILD_ROOT@ +SANE_CFLAGS = @SANE_CFLAGS@ +SANE_LIBS = @SANE_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ +SHAREDLDAP_LA = @SHAREDLDAP_LA@ +SHAREDOBBY_LA = @SHAREDOBBY_LA@ +SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ +SHAREDPGCTX_LA = @SHAREDPGCTX_LA@ +SHAREDQTSQLCTX_LA = @SHAREDQTSQLCTX_LA@ +SHAREDSOPRANOEA_LA = @SHAREDSOPRANOEA_LA@ +SHAREDSQLPLUS_LA = @SHAREDSQLPLUS_LA@ +SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ +SHAREDWIKI_LA = @SHAREDWIKI_LA@ +SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ +SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ +SHELL = @SHELL@ +SIGC_CFLAGS = @SIGC_CFLAGS@ +SIGC_LIBS = @SIGC_LIBS@ +SOCKETPP_CFLAGS = @SOCKETPP_CFLAGS@ +SOCKETPP_LIBS = @SOCKETPP_LIBS@ +SOPRANOEAMODDIR = @SOPRANOEAMODDIR@ +SOPRANO_CFLAGS = @SOPRANO_CFLAGS@ +SOPRANO_LIBS = @SOPRANO_LIBS@ +SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ +SQLITE3_LIBS = @SQLITE3_LIBS@ +SQLPLUSMODDIR = @SQLPLUSMODDIR@ +SQLPLUS_CFLAGS = @SQLPLUS_CFLAGS@ +SQLPLUS_LIBS = @SQLPLUS_LIBS@ +SSHCMD = @SSHCMD@ +STLDB4_CFLAGS = @STLDB4_CFLAGS@ +STLDB4_LIBS = @STLDB4_LIBS@ +STLPORT_CFLAGS = @STLPORT_CFLAGS@ +STLPORT_LDFLAGS = @STLPORT_LDFLAGS@ +STLPORT_LIB = @STLPORT_LIB@ +STLPORT_LIBS = @STLPORT_LIBS@ +STREAMS_CFLAGS = @STREAMS_CFLAGS@ +STREAMS_LIBS = @STREAMS_LIBS@ +STRIGI_CFLAGS = @STRIGI_CFLAGS@ +STRIGI_LIBS = @STRIGI_LIBS@ +STRIP = @STRIP@ +SVMLIGHT_CFLAGS = @SVMLIGHT_CFLAGS@ +SVMLIGHT_LIBS = @SVMLIGHT_LIBS@ +SWIG_OCAML_CFLAGS = @SWIG_OCAML_CFLAGS@ +SWIG_OCAML_HEADERDIR = @SWIG_OCAML_HEADERDIR@ +SWIG_PERL_CFLAGS = @SWIG_PERL_CFLAGS@ +SWIG_PERL_PMDIR = @SWIG_PERL_PMDIR@ +SWIG_PYTHON_CFLAGS = @SWIG_PYTHON_CFLAGS@ +SWIG_PYTHON_LIBDIR = @SWIG_PYTHON_LIBDIR@ +SWIG_PYTHON_MODULEDIR = @SWIG_PYTHON_MODULEDIR@ +SYSCONFDIR = @SYSCONFDIR@ +TAGLIB_CFLAGS = @TAGLIB_CFLAGS@ +TAGLIB_LIBS = @TAGLIB_LIBS@ +TDB_CFLAGS = @TDB_CFLAGS@ +TDB_LIBS = @TDB_LIBS@ +TSEARCH2_CFLAGS = @TSEARCH2_CFLAGS@ +TSEARCH2_LIBS = @TSEARCH2_LIBS@ +UUID_LIBS = @UUID_LIBS@ +VERSION = @VERSION@ +WAV_CFLAGS = @WAV_CFLAGS@ +WAV_LIBS = @WAV_LIBS@ +WEBPHOTOSDIR = @WEBPHOTOSDIR@ +WIKIDIR = @WIKIDIR@ +XALAN_CFLAGS = @XALAN_CFLAGS@ +XALAN_LIBS = @XALAN_LIBS@ +XAPIAN_CFLAGS = @XAPIAN_CFLAGS@ +XAPIAN_CONFIG = @XAPIAN_CONFIG@ +XAPIAN_LIBS = @XAPIAN_LIBS@ +XERCESC_CFLAGS = @XERCESC_CFLAGS@ +XERCESC_LIBS = @XERCESC_LIBS@ +XERCES_INTERNAL_HEADERS_CFLAGS = @XERCES_INTERNAL_HEADERS_CFLAGS@ +XFSPROGS_CFLAGS = @XFSPROGS_CFLAGS@ +XFSPROGS_LIBS = @XFSPROGS_LIBS@ +XINE_ACFLAGS = @XINE_ACFLAGS@ +XINE_CFLAGS = @XINE_CFLAGS@ +XINE_CONFIG = @XINE_CONFIG@ +XINE_EAGENERATOR_CFLAGS = @XINE_EAGENERATOR_CFLAGS@ +XINE_EAGENERATOR_LIBS = @XINE_EAGENERATOR_LIBS@ +XINE_LIBS = @XINE_LIBS@ +XML4C_CFLAGS = @XML4C_CFLAGS@ +XML4C_LIBS = @XML4C_LIBS@ +XMP_CFLAGS = @XMP_CFLAGS@ +XMP_LIBS = @XMP_LIBS@ +XQILLA_CFLAGS = @XQILLA_CFLAGS@ +XQILLA_LIBS = @XQILLA_LIBS@ +XSD_BASIC_BOOL = @XSD_BASIC_BOOL@ +XSD_BASIC_DOUBLE = @XSD_BASIC_DOUBLE@ +XSD_BASIC_FLOAT = @XSD_BASIC_FLOAT@ +XSD_BASIC_INT = @XSD_BASIC_INT@ +XSD_BASIC_INTEGER = @XSD_BASIC_INTEGER@ +XSD_BASIC_STRING = @XSD_BASIC_STRING@ +XSD_SCHEMA = @XSD_SCHEMA@ +XSD_UNKNOWN = @XSD_UNKNOWN@ +XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ +XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_GCJ = @ac_ct_GCJ@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_bogofilter = @have_bogofilter@ +have_bonobo = @have_bonobo@ +have_curl = @have_curl@ +have_dbus = @have_dbus@ +have_edb = @have_edb@ +have_eet = @have_eet@ +have_efsd = @have_efsd@ +have_epeg = @have_epeg@ +have_fsh = @have_fsh@ +have_hevea = @have_hevea@ +have_imlib2 = @have_imlib2@ +have_lynx = @have_lynx@ +have_magick = @have_magick@ +have_openssl = @have_openssl@ +have_ps2ascii = @have_ps2ascii@ +have_stlportcfg = @have_stlportcfg@ +have_swig_ocaml = @have_swig_ocaml@ +have_swig_perl = @have_swig_perl@ +have_swig_python = @have_swig_python@ +have_unrtf = @have_unrtf@ +have_wv = @have_wv@ +have_xmms = @have_xmms@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sqlite3_CFLAGS = @sqlite3_CFLAGS@ +sqlite3_LIBS = @sqlite3_LIBS@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# A list of all the files in the current directory which can be regenerated +MAINTAINERCLEANFILES = Makefile.in +@FERRIS_HAVE_CGICC_TRUE@cgibindir = /var/www/cgi-bin/ferris +@FERRIS_HAVE_CGICC_TRUE@INCLUDES = \ +@FERRIS_HAVE_CGICC_TRUE@ @STLPORT_CFLAGS@ \ +@FERRIS_HAVE_CGICC_TRUE@ -I. \ +@FERRIS_HAVE_CGICC_TRUE@ -I$(srcdir) -I$(top_srcdir) \ +@FERRIS_HAVE_CGICC_TRUE@ -I$(top_builddir) \ +@FERRIS_HAVE_CGICC_TRUE@ -I$(includedir) \ +@FERRIS_HAVE_CGICC_TRUE@ -I/usr/local/include \ +@FERRIS_HAVE_CGICC_TRUE@ @CFLAGS@ + +@FERRIS_HAVE_CGICC_TRUE@rest_SOURCES = rest.cpp +@FERRIS_HAVE_CGICC_TRUE@rest_LDADD = -lm -lpopt +@FERRIS_HAVE_CGICC_TRUE@rest_LDFLAGS = @LIBFERRIS_LA@ \ +@FERRIS_HAVE_CGICC_TRUE@ -L/usr/lib -lcgicc + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu apps/rest/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu apps/rest/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-cgibinPROGRAMS: $(cgibin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(cgibindir)" || $(MKDIR_P) "$(DESTDIR)$(cgibindir)" + @list='$(cgibin_PROGRAMS)'; test -n "$(cgibindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cgibindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cgibindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-cgibinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(cgibin_PROGRAMS)'; test -n "$(cgibindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(cgibindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(cgibindir)" && rm -f $$files + +clean-cgibinPROGRAMS: + @list='$(cgibin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +rest$(EXEEXT): $(rest_OBJECTS) $(rest_DEPENDENCIES) + @rm -f rest$(EXEEXT) + $(rest_LINK) $(rest_OBJECTS) $(rest_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rest.Po@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(cgibindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-cgibinPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-cgibinPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-cgibinPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-cgibinPROGRAMS clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-cgibinPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am 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-cgibinPROGRAMS + + +# 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. +.NOEXPORT: diff --git a/apps/rest/rest.cpp b/apps/rest/rest.cpp new file mode 100644 index 0000000..b609c56 --- /dev/null +++ b/apps/rest/rest.cpp @@ -0,0 +1,539 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + Copyright (C) 2012 Ben Martin + + This file is part of libferris. + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: rest.cpp,v 1.26 2010/09/24 21:30:26 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +using namespace std; +using namespace Ferris; + +#define DEBUG cerr + +cgicc::Cgicc cgi; + +#define X(str) XStr(str).unicodeForm() + +struct krustyGatewayMethod; +typedef Loki::SingletonHolder< + Loki::Factory< krustyGatewayMethod, std::string >, + Loki::CreateUsingNew, Loki::NoDestroy > +krustyGatewayFactory; + +struct krustyGatewayMethod +{ + krustyGatewayMethod( const char* name ) + { + } + virtual void operator()() + { + } + void displayContentType() + { + string format = cgi("format"); + if( format == "xml" ) + { + cout << "Content-Type: text/xml\n" << endl; + return; + } + cout << "Content-Type: text/json\n" << endl; + } + + void display( fh_context c, + stringlist_t eanames, + int recurse = 0, + bool includeContent = true ) const + { + string format = cgi("format"); + if( format == "xml" ) + { +// cerr << "display in XML!" << endl; + std::string ret = XML::contextToXML( c, eanames, recurse ); + cout << ret << endl; + return; + } + std::string ret = contextToJSON( c, eanames, recurse ); + cout << ret << endl; + } + + void prepOutputStringMap( fh_context c, stringmap_t& sm, + const std::string& attr, const std::string& defval = "" ) const + { + sm[ attr ] = getStrAttr( c, attr, defval ); + } + void display( stringmap_t& sm ) const + { + string format = cgi("format"); + if( format == "xml" ) + { + std::string ret = XML::stringmapToXML( sm ); + cout << ret << endl; + return; + } + + std::string ret = stringmapToJSON( sm ); + cout << ret << endl; + } + void display( fh_domdoc doc ) + { + string format = cgi("format"); + if( format == "xml" ) + { + fh_stringstream retss = tostream( doc ); + cout << tostr( retss ) << endl; + return; + } + std::string ret = XMLToJSON( doc ); + cout << ret << endl; + } + + void showEmblemList( emblems_t& el ) + { + DOMImplementation *impl = Factory::getDefaultDOMImpl(); + fh_domdoc doc = impl->createDocument( 0, X("result"), 0 ); + DOMElement* root = doc->getDocumentElement(); + + for( emblems_t::iterator ei = el.begin(); ei!=el.end(); ++ei ) + { + fh_emblem em = *ei; + DOMElement* e = doc->createElement( X("emblem") ); + root->appendChild( e ); + setAttribute( e, "id", tostr(em->getID()) ); + setAttribute( e, "name", em->getName() ); + } + display( doc ); + } + + +}; +template < class ChildClass > +struct krustyGatewayMethodBase : public krustyGatewayMethod +{ + static krustyGatewayMethod* create() + { + return new ChildClass(); + } + krustyGatewayMethodBase( const char* name ) + : krustyGatewayMethod( name ) + { + krustyGatewayFactory::Instance().Register( name, &create ); + } +}; + +#define METHODDECL( cppMethodName, methodName ) \ + struct cppMethodName : krustyGatewayMethodBase< cppMethodName > \ + { \ + cppMethodName() : krustyGatewayMethodBase< cppMethodName >( methodName ) \ + {} \ + void operator()(); \ + }; \ +cppMethodName cppMethodName ## obj; + +#define METHODIMPL( cppMethodName, methodName ) \ + void cppMethodName::operator()() + +#define METHODDEF( cppMethodName, methodName ) \ + METHODDECL( cppMethodName, methodName ); \ + METHODIMPL( cppMethodName, methodName ) + +/******************************************************************************/ +/******************************************************************************/ +/******************************************************************************/ + +static bool isTrue( const char* cgivar, std::string defval ) +{ + string s = cgi( cgivar ); + if( !s.empty() ) + return isTrue( s ); + return isTrue( defval ); +} + +METHODDEF( eaqueryMethod, "eaquery" ) +{ + displayContentType(); + + DEBUG << "eaquery!" << endl; + string eaindexpath = cgi("eaindexpath"); + string q = cgi("q"); + stringlist_t eanames = Util::parseCommaSeperatedList( cgi("eanames")); + long limit = toint(cgi("limit")); + + if( !eaindexpath.empty() ) + { + ::Ferris::EAIndex::Factory::setDefaultEAIndexPath( eaindexpath.c_str() ); + } + + DEBUG << "eaindexpath:" << eaindexpath << endl; + DEBUG << "q:" << q << endl; + DEBUG << "limit:" << limit << endl; + DEBUG << "eanames.sz:" << eanames.size() << endl; + + fh_context c = EAIndex::ExecuteQuery( q, limit ); + DEBUG << "result count:" << c->getSubContextCount() << endl; + display( c, eanames, 1 ); +} + + +METHODDEF( getDocByEAIndexDocIDMethod, "get-doc-by-ea-index-docid" ) +{ + DEBUG << "get by index docid..." << endl; + string eaindexpath = cgi("eaindexpath"); + string docid = cgi("docid"); + + if( !eaindexpath.empty() ) + { + ::Ferris::EAIndex::Factory::setDefaultEAIndexPath( eaindexpath.c_str() ); + } + + fh_context c = Resolve((string)"docidea:" + docid); + DEBUG << "c.url:" << c->getURL() << endl; + std::string mimetype = "text/plain"; + mimetype = getStrAttr( c, "mimetype-from-file-command", mimetype ); + std::string rdn = c->getDirName(); + std::string nameonly = getStrAttr( c, "name-only", "" ); + if( !nameonly.empty() ) + { + rdn = nameonly; + int pos = rdn.rfind('/'); + if( pos != string::npos ) + rdn = rdn.substr( pos + 1 ); + } + cout << "Content-Type: " << mimetype << endl; + cout << "Content-Disposition: inline; filename=" << rdn << endl; + cout << endl; + cout << getStrAttr( c, "content", "", true, true ); +} + +METHODDEF( ls, "ls" ) +{ + displayContentType(); +// DEBUG << "ls..." << endl; + + string path = cgi("path"); + stringlist_t eanames = Util::parseCommaSeperatedList( cgi("eanames")); + + try + { + fh_context c = Resolve( path ); + display( c, eanames, 1 ); + } + catch( FerrisNotReadableAsContext& e ) + { + cout << "" << endl + << " " << path << "" << endl + << " Can no read because:" << e.what() << "" << endl + << "" << endl; + } +} + + +METHODDEF( readmethod, "read" ) +{ + cout << "Content-Type: text/plain\n" << endl; +// DEBUG << "read..." << endl; + string path = cgi("path"); + string eaname = cgi("ea"); + if( eaname.empty() ) + eaname = "content"; + + fh_context c = Resolve( path ); + cout << getStrAttr( c, eaname, "" ); +} + + +METHODDEF( writemethod, "write" ) +{ + displayContentType(); + + string path = cgi("path"); + string eaname = cgi("ea"); + string data = cgi.getEnvironment().getPostData(); + + try + { + if( eaname.empty() ) + eaname = "content"; + if( data.empty() ) + data = cgi("data"); + + fh_context c = Resolve( path ); + setStrAttr( c, eaname, data, true, true ); + cout << "" << endl; + } + catch( CanNotGetStream& e ) + { + cout << "" << endl + << " " << path << "" << endl + << " " << e.what() << "" << endl + << "" << endl; + } +} + + + +METHODDEF( statmethod, "stat" ) +{ + displayContentType(); + string path = cgi("path"); + unsigned long Dereference = isTrue( "derefrence", "0" ); + stringlist_t eanames = Util::parseCommaSeperatedList( cgi("eanames")); + string LinkPrefix = "dontfollow-"; + if( Dereference ) + { + LinkPrefix = ""; + } + + try + { + stringmap_t sm; + fh_context c = Resolve( path ); + prepOutputStringMap( c, sm, "path" ); + prepOutputStringMap( c, sm, "size" ); + prepOutputStringMap( c, sm, "block-count" ); + prepOutputStringMap( c, sm, "block-size" ); + prepOutputStringMap( c, sm, "mode" ); + prepOutputStringMap( c, sm, "device-major-hex" ); + prepOutputStringMap( c, sm, "device-minor-hex" ); + prepOutputStringMap( c, sm, "device-hex" ); + prepOutputStringMap( c, sm, "inode" ); + prepOutputStringMap( c, sm, "hard-link-count" ); + prepOutputStringMap( c, sm, "protection-raw" ); + prepOutputStringMap( c, sm, "protection-ls" ); + prepOutputStringMap( c, sm, "user-owner-number" ); + prepOutputStringMap( c, sm, "user-owner-name" ); + prepOutputStringMap( c, sm, "filesystem-filetype" ); + prepOutputStringMap( c, sm, "group-owner-number" ); + prepOutputStringMap( c, sm, "group-owner-name" ); + prepOutputStringMap( c, sm, "atime-display" ); + prepOutputStringMap( c, sm, "mtime-display" ); + prepOutputStringMap( c, sm, "ctime-display" ); + prepOutputStringMap( c, sm, "atime" ); + prepOutputStringMap( c, sm, "mtime" ); + prepOutputStringMap( c, sm, "ctime" ); + for( stringlist_t::iterator si = eanames.begin(); si != eanames.end(); ++si ) + { + prepOutputStringMap( c, sm, *si ); + } + display( sm ); + } + catch( NoSuchSubContext& e ) + { + cout << "" << endl + << " " << path << "" << endl + << " " << e.what() << "" << endl + << "" << endl; + } +} +METHODDEF( readlinkmethod, "readlink" ) +{ + displayContentType(); + DEBUG << "readlink..." << endl; + string path = cgi("path"); + + stringmap_t sm; + fh_context c = Resolve( path ); + prepOutputStringMap( c, sm, "url" ); + prepOutputStringMap( c, sm, "link-target" ); + prepOutputStringMap( c, sm, "is-link" ); + string s = getStrAttr( c, "link-target", "" ); + if( s.empty() ) + s = getStrAttr( c, "url", "" ); + sm[ "target" ] = s; + display( sm ); +} + + +METHODDEF( fileactionmethod, "file-action" ) +{ + displayContentType(); + DEBUG << "file-action..." << endl; + string path = cgi("path"); + string opname = cgi("opname"); + if( opname.empty() ) + opname = "view"; + ctxlist_t cl; + cl.push_back( Resolve( path ) ); + FileActions::OpenWith( opname, cl ); +} + +METHODDEF( touchmethod, "touch" ) +{ + displayContentType(); + string path = cgi("path"); + bool isDir = !cgi("isdir").empty(); + bool create = true; + + fh_context c = Shell::touch( path, create, isDir ); +} + +METHODDEF( mkdirmethod, "mkdir" ) +{ + displayContentType(); + string path = cgi("path"); + + fh_context c = Shell::CreateDir( path ); +} + +METHODDEF( cpmethod, "cp" ) +{ + displayContentType(); + string src = cgi("source"); + string dst = cgi("destination"); + + fh_cp_tty obj = new FerrisCopy_TTY(); + obj->setShowMeter( true ); + obj->setSrcURL( src ); + obj->setDstURL( dst ); + obj->copy(); +} + + +METHODDEF( listallemblemsmethod, "list-all-emblems" ) +{ + displayContentType(); + + fh_etagere et = Factory::getEtagere(); + emblems_t el = et->getAllEmblems(); + showEmblemList( el ); +} + +METHODDEF( fileemblemslistmethod, "file-emblems-list" ) +{ + displayContentType(); + string path = cgi("path"); + + fh_context c = Resolve( path ); + fh_medallion m = c->getMedallion(); + emblems_t el = m->getMostSpecificEmblems(); + cerr << "ListEmblem count:" << el.size() << endl; + showEmblemList( el ); +} + +METHODDEF( fileemblemsaddmethod, "file-emblems-add" ) +{ + displayContentType(); + string path = cgi("path"); + string EmblemName = cgi("emblem"); + string EmblemID = cgi("emblemid"); + bool CreateEmblem = isTrue(cgi("create")); + + fh_etagere et = Factory::getEtagere(); + fh_emblem em = 0; + try + { + if( !EmblemName.empty() ) + em = et->getEmblemByName( EmblemName ); + if( !EmblemID.empty() ) + em = et->getEmblemByID( toType( EmblemID )); + } + catch( EmblemNotFoundException& e ) + { + if( CreateEmblem ) + { + fh_emblem root = et->obtainEmblemByName( "libferris-created-emblems" ); + em = root->obtainChild( EmblemName ); + et->sync(); + } + } + + fh_context c = Resolve( path ); + fh_medallion m = c->getMedallion(); + m->addEmblem( em ); + m->sync(); +} + +METHODDEF( fileemblemsremovemethod, "file-emblems-remove" ) +{ + displayContentType(); + string path = cgi("path"); + string EmblemName = cgi("emblem"); + string EmblemID = cgi("emblemid"); + + fh_etagere et = Factory::getEtagere(); + fh_emblem em = 0; + if( !EmblemName.empty() ) + em = et->getEmblemByName( EmblemName ); + if( !EmblemID.empty() ) + em = et->getEmblemByID( toType( EmblemID )); + + fh_context c = Resolve( path ); + fh_medallion m = c->getMedallion(); + m->removeEmblem( em ); + m->sync(); +} + + +METHODDEF( versionmethod, "version" ) +{ + displayContentType(); + stringmap_t sm; + sm["version"] = VERSION; + display( sm ); +} + + +int +main () +{ +// cout << "name:" << cgi("name") << " foo:" << cgi("foo") << endl; + + std::string methodname = cgi("method"); + try + { + krustyGatewayMethod* m = krustyGatewayFactory::Instance().CreateObject( methodname ); + (*m)(); + return 0; + } + catch( Loki::Factory< krustyGatewayMethod, std::string >::Exception& e ) + { + cerr << "" << endl + << " method " << methodname << " does not exist!" << endl + << "" << endl; + return 1; + } + catch( exception& e ) + { + cerr << e.what() << endl; + return 1; + } +} + diff --git a/apps/rm/Makefile.in b/apps/rm/Makefile.in index c09e541..6a1f9e1 100644 --- a/apps/rm/Makefile.in +++ b/apps/rm/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/scripts/Makefile.in b/apps/scripts/Makefile.in index 48ba7f2..0bc67f7 100644 --- a/apps/scripts/Makefile.in +++ b/apps/scripts/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/tail/Makefile.in b/apps/tail/Makefile.in index 5190544..d1485b7 100644 --- a/apps/tail/Makefile.in +++ b/apps/tail/Makefile.in @@ -113,6 +113,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -121,6 +123,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -176,6 +180,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -410,6 +415,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -482,6 +488,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -493,6 +500,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -572,6 +580,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/tools/Makefile.in b/apps/tools/Makefile.in index 5477a7b..a0bd115 100644 --- a/apps/tools/Makefile.in +++ b/apps/tools/Makefile.in @@ -143,6 +143,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -151,6 +153,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -206,6 +210,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -440,6 +445,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -512,6 +518,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -523,6 +530,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -602,6 +610,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/upnpserver/Makefile.in b/apps/upnpserver/Makefile.in index f16f269..3687f64 100644 --- a/apps/upnpserver/Makefile.in +++ b/apps/upnpserver/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/volumemanager/Makefile.in b/apps/volumemanager/Makefile.in index a66adcb..5f6c7a1 100644 --- a/apps/volumemanager/Makefile.in +++ b/apps/volumemanager/Makefile.in @@ -152,6 +152,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -160,6 +162,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -215,6 +219,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -449,6 +454,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -521,6 +527,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -532,6 +539,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -611,6 +619,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/xml/CGITransform/CGIFerrisTransform.cpp b/apps/xml/CGITransform/CGIFerrisTransform.cpp index fdaac6a..fba034d 100644 --- a/apps/xml/CGITransform/CGIFerrisTransform.cpp +++ b/apps/xml/CGITransform/CGIFerrisTransform.cpp @@ -28,17 +28,16 @@ ******************************************************************************/ //QUERY_STRING="hi=there&name=frodo&address=bree" ./CGIFerrisTransform >|/tmp/new7.html -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include @@ -60,6 +60,8 @@ using namespace std; using namespace Ferris; +using namespace XALAN_CPP_NAMESPACE; + #define X(str) XStr(str).unicodeForm() const string PROGRAM_NAME = "XSLTransform"; diff --git a/apps/xml/CGITransform/Makefile.am b/apps/xml/CGITransform/Makefile.am index a314ed3..3c1bed2 100644 --- a/apps/xml/CGITransform/Makefile.am +++ b/apps/xml/CGITransform/Makefile.am @@ -23,12 +23,13 @@ INCLUDES = \ -I$(includedir) \ -I/usr/local/include \ @GLIB_CFLAGS@ \ + @XERCESC_CFLAGS@ \ @XALAN_CFLAGS@ \ @CFLAGS@ CGIFerrisTransform_SOURCES = CGIFerrisTransform.cpp CGIFerrisTransform_LDADD = -lpopt @LIBFERRIS_LA@ -CGIFerrisTransform_LDFLAGS = @GLIB_LIBS@ @XALAN_LIBS@ \ +CGIFerrisTransform_LDFLAGS = @GLIB_LIBS@ @XERCESC_LIBS@ @XALAN_LIBS@ \ -L/usr/lib -lcgicc diff --git a/apps/xml/CGITransform/Makefile.in b/apps/xml/CGITransform/Makefile.in index ce19353..61ea691 100644 --- a/apps/xml/CGITransform/Makefile.in +++ b/apps/xml/CGITransform/Makefile.in @@ -141,6 +141,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -149,6 +151,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -204,6 +208,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -438,6 +443,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -510,6 +516,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -521,6 +528,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -600,6 +608,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -695,12 +704,13 @@ xml_DATA = $(XML_FILES) @FERRIS_HAVE_CGICC_TRUE@ -I$(includedir) \ @FERRIS_HAVE_CGICC_TRUE@ -I/usr/local/include \ @FERRIS_HAVE_CGICC_TRUE@ @GLIB_CFLAGS@ \ +@FERRIS_HAVE_CGICC_TRUE@ @XERCESC_CFLAGS@ \ @FERRIS_HAVE_CGICC_TRUE@ @XALAN_CFLAGS@ \ @FERRIS_HAVE_CGICC_TRUE@ @CFLAGS@ @FERRIS_HAVE_CGICC_TRUE@CGIFerrisTransform_SOURCES = CGIFerrisTransform.cpp @FERRIS_HAVE_CGICC_TRUE@CGIFerrisTransform_LDADD = -lpopt @LIBFERRIS_LA@ -@FERRIS_HAVE_CGICC_TRUE@CGIFerrisTransform_LDFLAGS = @GLIB_LIBS@ @XALAN_LIBS@ \ +@FERRIS_HAVE_CGICC_TRUE@CGIFerrisTransform_LDFLAGS = @GLIB_LIBS@ @XERCESC_LIBS@ @XALAN_LIBS@ \ @FERRIS_HAVE_CGICC_TRUE@ -L/usr/lib -lcgicc all: all-am diff --git a/apps/xml/Makefile.in b/apps/xml/Makefile.in index ed3a872..8318a09 100644 --- a/apps/xml/Makefile.in +++ b/apps/xml/Makefile.in @@ -198,6 +198,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -206,6 +208,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -261,6 +265,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -495,6 +500,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -567,6 +573,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -578,6 +585,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -657,6 +665,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/xml/XSLTransform/Makefile.in b/apps/xml/XSLTransform/Makefile.in index acc09b5..07ad9af 100644 --- a/apps/xml/XSLTransform/Makefile.in +++ b/apps/xml/XSLTransform/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/apps/xmmsdaemon/Makefile.in b/apps/xmmsdaemon/Makefile.in index 0a8a0fd..da06c21 100644 --- a/apps/xmmsdaemon/Makefile.in +++ b/apps/xmmsdaemon/Makefile.in @@ -119,6 +119,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -127,6 +129,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -182,6 +186,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -416,6 +421,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -488,6 +494,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -499,6 +506,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -578,6 +586,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/Makefile.in b/appsui/Makefile.in index 3c0a85d..6203eff 100644 --- a/appsui/Makefile.in +++ b/appsui/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfcopy/Makefile.in b/appsui/gfcopy/Makefile.in index 817618a..334bc21 100644 --- a/appsui/gfcopy/Makefile.in +++ b/appsui/gfcopy/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfdl/Makefile.in b/appsui/gfdl/Makefile.in index 50e0188..494b343 100644 --- a/appsui/gfdl/Makefile.in +++ b/appsui/gfdl/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfindex/Makefile.in b/appsui/gfindex/Makefile.in index 9a732ca..3fc7d85 100644 --- a/appsui/gfindex/Makefile.in +++ b/appsui/gfindex/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfmv/Makefile.in b/appsui/gfmv/Makefile.in index 182df55..60a18b7 100644 --- a/appsui/gfmv/Makefile.in +++ b/appsui/gfmv/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfproperties/Makefile.in b/appsui/gfproperties/Makefile.in index 91b9126..71187ca 100644 --- a/appsui/gfproperties/Makefile.in +++ b/appsui/gfproperties/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/gfrm/Makefile.in b/appsui/gfrm/Makefile.in index 3231c25..e562994 100644 --- a/appsui/gfrm/Makefile.in +++ b/appsui/gfrm/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/appsui/volumemanager/Makefile.in b/appsui/volumemanager/Makefile.in index a6e115e..6e21652 100644 --- a/appsui/volumemanager/Makefile.in +++ b/appsui/volumemanager/Makefile.in @@ -120,6 +120,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -128,6 +130,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -183,6 +187,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -417,6 +422,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -489,6 +495,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -500,6 +507,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -579,6 +587,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/Ferris/Makefile.in b/cc/Ferris/Makefile.in index d6d43d6..8c78522 100644 --- a/cc/Ferris/Makefile.in +++ b/cc/Ferris/Makefile.in @@ -99,6 +99,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -107,6 +109,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -162,6 +166,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -396,6 +401,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -468,6 +474,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -479,6 +486,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -558,6 +566,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/Makefile.in b/cc/Makefile.in index 035f59d..20a188e 100644 --- a/cc/Makefile.in +++ b/cc/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/Makefile.in b/cc/capplets/Makefile.in index 7cbfb04..6a1636d 100644 --- a/cc/capplets/Makefile.in +++ b/cc/capplets/Makefile.in @@ -132,6 +132,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -140,6 +142,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -195,6 +199,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -429,6 +434,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -501,6 +507,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -512,6 +519,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -591,6 +599,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/agents/Makefile.in b/cc/capplets/agents/Makefile.in index 13d0f91..30806c4 100644 --- a/cc/capplets/agents/Makefile.in +++ b/cc/capplets/agents/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/auth/Makefile.am b/cc/capplets/auth/Makefile.am index eca2126..7b27d9c 100644 --- a/cc/capplets/auth/Makefile.am +++ b/cc/capplets/auth/Makefile.am @@ -13,6 +13,8 @@ INCLUDES = \ -I@SQLPLUSMODDIR@ \ @LIBPQXX_CFLAGS@ \ -I@PGCTXMODDIR@ \ + -I@ZMCTXMODDIR@ \ + -I@FERRISRESTCTXMODDIR@ \ @DTL_CFLAGS@ \ -I@DTLMODDIR@ \ @LDAP_CFLAGS@ \ @@ -31,6 +33,8 @@ ferris_capplet_auth_SOURCES = ferris-capplet-auth.cpp ferris_capplet_auth_LDADD = -lpopt @LIBFERRIS_LA@ @LIBFERRISUI_LA@ \ @SHAREDSQLPLUS_LA@ \ @SHAREDPGCTX_LA@ \ + @SHAREDZMCTX_LA@ \ + @SHAREDFERRISRESTCTX_LA@ \ @SHAREDDTL_LA@ \ @SHAREDLDAP_LA@ \ @SHAREDWEBPHOTOS_LA@ \ diff --git a/cc/capplets/auth/Makefile.in b/cc/capplets/auth/Makefile.in index 407df3e..7ffbfa2 100644 --- a/cc/capplets/auth/Makefile.in +++ b/cc/capplets/auth/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -667,6 +676,8 @@ INCLUDES = \ -I@SQLPLUSMODDIR@ \ @LIBPQXX_CFLAGS@ \ -I@PGCTXMODDIR@ \ + -I@ZMCTXMODDIR@ \ + -I@FERRISRESTCTXMODDIR@ \ @DTL_CFLAGS@ \ -I@DTLMODDIR@ \ @LDAP_CFLAGS@ \ @@ -683,6 +694,8 @@ ferris_capplet_auth_SOURCES = ferris-capplet-auth.cpp ferris_capplet_auth_LDADD = -lpopt @LIBFERRIS_LA@ @LIBFERRISUI_LA@ \ @SHAREDSQLPLUS_LA@ \ @SHAREDPGCTX_LA@ \ + @SHAREDZMCTX_LA@ \ + @SHAREDFERRISRESTCTX_LA@ \ @SHAREDDTL_LA@ \ @SHAREDLDAP_LA@ \ @SHAREDWEBPHOTOS_LA@ \ diff --git a/cc/capplets/auth/ferris-capplet-auth.cpp b/cc/capplets/auth/ferris-capplet-auth.cpp index a867718..7cf90a8 100644 --- a/cc/capplets/auth/ferris-capplet-auth.cpp +++ b/cc/capplets/auth/ferris-capplet-auth.cpp @@ -109,6 +109,8 @@ using namespace PGSTD; using namespace pqxx; #endif +#include +#include #ifdef HAVE_DTL #include @@ -146,6 +148,13 @@ namespace Ferris GtkWidget* psql_username; GtkWidget* psql_password; + + GtkWidget* zm_username; + GtkWidget* zm_password; + + GtkWidget* ferrisrest_username; + GtkWidget* ferrisrest_password; + GtkWidget* ferrisrest_baseurl; GtkWidget* odbc_username; GtkWidget* odbc_password; @@ -1117,6 +1126,76 @@ my_search_equal_func(GtkTreeModel *model, } #endif + void zm_test_fe( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer udata) + { + GtkTreeView* tv = GTK_TREE_VIEW(w_treeview); + GtkTreeModel* tm = GTK_TREE_MODEL(w_treemodel); + GtkTreeStore* ts = GTK_TREE_STORE(w_treemodel); + } + + + void ferrisrest_test_fe( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer udata) + { + GtkTreeView* tv = GTK_TREE_VIEW(w_treeview); + GtkTreeModel* tm = GTK_TREE_MODEL(w_treemodel); + GtkTreeStore* ts = GTK_TREE_STORE(w_treemodel); + + string db = ""; + string serv = treestr( iter, C_SERV ); + string user = gtk_entry_get_text(GTK_ENTRY(ferrisrest_username)); + string pass = gtk_entry_get_text(GTK_ENTRY(ferrisrest_password)); + string base = gtk_entry_get_text(GTK_ENTRY(ferrisrest_baseurl)); + + Ferrisrest::setUserPass( serv, user, pass ); + Ferrisrest::setBaseURI( serv, base ); + + stringmap_t args; + args["method"] = "version"; + args["format"] = "xml"; + args["zz"] = "top"; + + Ferrisrest::fh_ferrisrest zm = Factory::getFerrisrest( serv ); + QNetworkReply* reply = zm->post( args ); + QByteArray ba = reply->readAll(); + string v = ""; + try + { + fh_domdoc dom = zm->toDOM( ba ); + DOMElement* di = dom->getDocumentElement(); + if( di && tostr(di->getNodeName()) == "result" ) + { + std::list< DOMElement* > keyvals = XML::getAllChildrenElements( (DOMNode*)di, "keyval" ); + for( std::list< DOMElement* >::iterator kviter = keyvals.begin(); + kviter != keyvals.end(); ++kviter ) + { + string key = ::Ferris::getAttribute( (DOMElement*)*kviter, "key" ); + string val = XML::getChildText( (DOMElement*)*kviter ); + if( key == "version" ) + v = val; + } + if( !v.empty() ) + { + fh_stringstream infoss; + infoss << "Success connecting to libferris over rest." << endl + << " remote version:" << v << endl; + RunInfoDialog(tostr(infoss)); + } + } + } + catch( exception& e ) + { + } + if( v.empty() ) + { + fh_stringstream infoss; + infoss << "Failed connecting to libferris over rest." << endl + << " response:" << tostr(ba) << endl; + RunErrorDialog(tostr(infoss)); + } + + } + + #ifdef HAVE_DTL void odbc_test_fe( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer udata) { @@ -1222,6 +1301,20 @@ my_search_equal_func(GtkTreeModel *model, } #endif + { + string username = gtk_entry_get_text(GTK_ENTRY(zm_username)); + string password = gtk_entry_get_text(GTK_ENTRY(zm_password)); + Zoneminder::setUserPass( old, username, password ); + } + + { + string username = gtk_entry_get_text(GTK_ENTRY(ferrisrest_username)); + string password = gtk_entry_get_text(GTK_ENTRY(ferrisrest_password)); + string baseurl = gtk_entry_get_text(GTK_ENTRY(ferrisrest_baseurl)); + Ferrisrest::setUserPass( old, username, password ); + Ferrisrest::setBaseURI( old, baseurl ); + } + #ifdef HAVE_DTL { string username = gtk_entry_get_text(GTK_ENTRY(odbc_username)); @@ -1274,6 +1367,27 @@ my_search_equal_func(GtkTreeModel *model, } #endif + { + userpass_t up = Zoneminder::getUserPass( current ); + string username = up.first; + string password = up.second; + + gtk_entry_set_text( GTK_ENTRY(zm_username), username.c_str() ); + gtk_entry_set_text( GTK_ENTRY(zm_password), password.c_str() ); + } + + + { + userpass_t up = Ferrisrest::getUserPass( current ); + string username = up.first; + string password = up.second; + + gtk_entry_set_text( GTK_ENTRY(ferrisrest_username), username.c_str() ); + gtk_entry_set_text( GTK_ENTRY(ferrisrest_password), password.c_str() ); + gtk_entry_set_text( GTK_ENTRY(ferrisrest_baseurl), + Ferrisrest::getBaseURI( current ).c_str() ); + } + #ifdef HAVE_DTL { @@ -2176,6 +2290,92 @@ my_search_equal_func(GtkTreeModel *model, gtk_notebook_append_page( gtk_notebook, v, gtk_label_new( "postgresql" )); } #endif + + // zoneminder + { + int r=0; + int c=0; + GtkWidget* l; + GtkWidget* e; + GtkWidget* page = gtk_table_new ( 2, 2, false ); + + l = gtk_label_new("username"); + gtk_table_attach_defaults(GTK_TABLE(page), l, c, c+1, r, r+1 ); + ++c; + zm_username = e = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(page), e, c, c+1, r, r+1 ); + c=0; ++r; + + l = gtk_label_new("password"); + gtk_table_attach_defaults(GTK_TABLE(page), l, c, c+1, r, r+1 ); + ++c; + zm_password = e = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(page), e, c, c+1, r, r+1 ); + c=0; ++r; + + GtkWidget* v = GTK_WIDGET(gtk_vbox_new(0,0)); + + GtkToolbar* tb = GTK_TOOLBAR(gtk_toolbar_new()); + b = gtk_toolbar_append_item( tb, "Test", + "try to connect to selected server/databases", "", + gtk_image_new_from_stock( + GTK_STOCK_EXECUTE, + GTK_ICON_SIZE_LARGE_TOOLBAR ), + GTK_SIGNAL_FUNC(test_cb), + (gpointer)zm_test_fe ); + + gtk_box_pack_start(GTK_BOX(v), GTK_WIDGET(tb), 0, 0, 0 ); + gtk_box_pack_start(GTK_BOX(v), page, 0, 0, 0 ); + gtk_box_pack_start(GTK_BOX(v), gtk_label_new(""), 1, 1, 0 ); + gtk_notebook_append_page( gtk_notebook, v, gtk_label_new( "zoneminder" )); + } + + + // ferrisrest + { + int r=0; + int c=0; + GtkWidget* l; + GtkWidget* e; + GtkWidget* page = gtk_table_new ( 2, 2, false ); + + l = gtk_label_new("username"); + gtk_table_attach_defaults(GTK_TABLE(page), l, c, c+1, r, r+1 ); + ++c; + ferrisrest_username = e = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(page), e, c, c+1, r, r+1 ); + c=0; ++r; + + l = gtk_label_new("password"); + gtk_table_attach_defaults(GTK_TABLE(page), l, c, c+1, r, r+1 ); + ++c; + ferrisrest_password = e = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(page), e, c, c+1, r, r+1 ); + c=0; ++r; + + l = gtk_label_new("REST path"); + gtk_table_attach_defaults(GTK_TABLE(page), l, c, c+1, r, r+1 ); + ++c; + ferrisrest_baseurl = e = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(page), e, c, c+1, r, r+1 ); + c=0; ++r; + + GtkWidget* v = GTK_WIDGET(gtk_vbox_new(0,0)); + + GtkToolbar* tb = GTK_TOOLBAR(gtk_toolbar_new()); + b = gtk_toolbar_append_item( tb, "Test", + "try to connect to selected server", "", + gtk_image_new_from_stock( + GTK_STOCK_EXECUTE, + GTK_ICON_SIZE_LARGE_TOOLBAR ), + GTK_SIGNAL_FUNC(test_cb), + (gpointer)ferrisrest_test_fe ); + + gtk_box_pack_start(GTK_BOX(v), GTK_WIDGET(tb), 0, 0, 0 ); + gtk_box_pack_start(GTK_BOX(v), page, 0, 0, 0 ); + gtk_box_pack_start(GTK_BOX(v), gtk_label_new(""), 1, 1, 0 ); + gtk_notebook_append_page( gtk_notebook, v, gtk_label_new( "ferrisrest" )); + } #ifdef HAVE_DTL // odbc page diff --git a/cc/capplets/curl-ftp/Makefile.in b/cc/capplets/curl-ftp/Makefile.in index 0d68635..f92a07c 100644 --- a/cc/capplets/curl-ftp/Makefile.in +++ b/cc/capplets/curl-ftp/Makefile.in @@ -119,6 +119,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -127,6 +129,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -182,6 +186,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -416,6 +421,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -488,6 +494,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -499,6 +506,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -578,6 +586,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/general/Makefile.in b/cc/capplets/general/Makefile.in index 65aa09a..9e3e82e 100644 --- a/cc/capplets/general/Makefile.in +++ b/cc/capplets/general/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/index/Makefile.in b/cc/capplets/index/Makefile.in index 44f4f16..e661de1 100644 --- a/cc/capplets/index/Makefile.in +++ b/cc/capplets/index/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/locale/Makefile.in b/cc/capplets/locale/Makefile.in index 398807b..d7142f2 100644 --- a/cc/capplets/locale/Makefile.in +++ b/cc/capplets/locale/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/logging/Makefile.in b/cc/capplets/logging/Makefile.in index 37dacd7..e771083 100644 --- a/cc/capplets/logging/Makefile.in +++ b/cc/capplets/logging/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/medallion/Makefile.in b/cc/capplets/medallion/Makefile.in index e248f88..82aeade 100644 --- a/cc/capplets/medallion/Makefile.in +++ b/cc/capplets/medallion/Makefile.in @@ -119,6 +119,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -127,6 +129,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -182,6 +186,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -416,6 +421,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -488,6 +494,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -499,6 +506,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -578,6 +586,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/rdf/Makefile.in b/cc/capplets/rdf/Makefile.in index 5c31b46..c18b0be 100644 --- a/cc/capplets/rdf/Makefile.in +++ b/cc/capplets/rdf/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/thumbnails/Makefile.in b/cc/capplets/thumbnails/Makefile.in index c7ecc11..ec451f2 100644 --- a/cc/capplets/thumbnails/Makefile.in +++ b/cc/capplets/thumbnails/Makefile.in @@ -119,6 +119,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -127,6 +129,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -182,6 +186,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -416,6 +421,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -488,6 +494,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -499,6 +506,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -578,6 +586,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/cc/capplets/version/Makefile.in b/cc/capplets/version/Makefile.in index ccadffd..108f651 100644 --- a/cc/capplets/version/Makefile.in +++ b/cc/capplets/version/Makefile.in @@ -117,6 +117,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -125,6 +127,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -180,6 +184,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -414,6 +419,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -486,6 +492,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -497,6 +504,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -576,6 +584,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/config.h.in b/config.h.in index cae961f..8a9fb45 100644 --- a/config.h.in +++ b/config.h.in @@ -281,8 +281,6 @@ /* Width of seekable units in iostreams */ #undef STLPORT_IOSIZE -/* Version number of package */ -#undef VERSION /* Defined if on Win32 platform */ #undef WIN32 diff --git a/configure b/configure index 4006b52..1f38189 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libferris 1.5.13. +# Generated by GNU Autoconf 2.68 for libferris 1.5.14. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libferris' PACKAGE_TARNAME='libferris' -PACKAGE_VERSION='1.5.13' -PACKAGE_STRING='libferris 1.5.13' +PACKAGE_VERSION='1.5.14' +PACKAGE_STRING='libferris 1.5.14' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -812,6 +812,7 @@ HAVE_QTSQL_FALSE HAVE_QTSQL_TRUE QTSQL_LIBS QTSQL_CFLAGS +MOC KDE_EAGENERATOR_LIBS KDE_EAGENERATOR_CFLAGS FERRIS_BUILD_KDE_EAGENERATOR_FALSE @@ -877,6 +878,10 @@ SHAREDWEBPHOTOS_LA WEBPHOTOSDIR CTXGSTREAMER_LA CTXGSTREAMERDIR +CTXFERRISREST_LA +CTXFERRISRESTDIR +CTXZONEMINDER_LA +CTXZONEMINDERDIR CTXIDENTICA_LA CTXIDENTICADIR CTXVIMEO_LA @@ -902,6 +907,10 @@ SHAREDLDAP_LA LDAPMODDIR SHAREDXAPIANEA_LA SHAREDXAPIANMODDIR +SHAREDFERRISRESTCTX_LA +FERRISRESTCTXMODDIR +SHAREDZMCTX_LA +ZMCTXMODDIR SHAREDPGCTX_LA PGCTXMODDIR SHAREDDTL_LA @@ -1465,7 +1474,6 @@ with_libfile_mime with_gnome_vfs_mime with_kde_mime enable_kde_detection -with_qt with_kde_includedir with_kde_libdir enable_plasma_detection @@ -2198,7 +2206,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libferris 1.5.13 to adapt to many kinds of systems. +\`configure' configures libferris 1.5.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2268,7 +2276,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libferris 1.5.13:";; + short | recursive ) echo "Configuration of libferris 1.5.14:";; esac cat <<\_ACEOF @@ -2400,7 +2408,6 @@ Optional Packages: --with-gnome-vfs-mime use gnome-vfs2 for mimetype determination (default=auto) --with-kde-mime use KDE4 for mimetype determination (default=auto) - --with-qt build with Qt utils. autodetected --with-kde-includedir=DIR root directory containing KDE include files --with-kde-libdir=DIR directory continaing KDE libs --with-plasma-includedir=DIR root directory containing PLASMA include files @@ -2666,7 +2673,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libferris configure 1.5.13 +libferris configure 1.5.14 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -3194,7 +3201,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libferris $as_me 1.5.13, which was +It was created by libferris $as_me 1.5.14, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3542,7 +3549,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -LIBFERRIS_BETA=13 +LIBFERRIS_BETA=14 LIBFERRIS_MINOR=5 LIBFERRIS_MAJOR=1 @@ -3560,6 +3567,10 @@ _ACEOF VERSION=$FERRIS_VERSION +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + ac_config_headers="$ac_config_headers config.h" @@ -4031,7 +4042,7 @@ fi # Define the identity of the package. PACKAGE='libferris' - VERSION='1.5.13' + VERSION='1.5.14' cat >>confdefs.h <<_ACEOF @@ -20124,7 +20135,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -libferris config.lt 1.5.13 +libferris config.lt 1.5.14 configured by $0, generated by GNU Autoconf 2.68. Copyright (C) 2010 Free Software Foundation, Inc. @@ -21889,7 +21900,7 @@ have_stlport=no if test "${with_stlport+set}" = set; then : withval=$with_stlport; STLPORT_CFLAGS=" -I$withval/stlport " STLPORT_LDFLAGS=" -L$withval/lib " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L$withval/lib ${STLPORT_LIB} " stlport_try_trivial_compile=yes @@ -22326,7 +22337,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/local/STLport-4.5/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L/usr/local/STLport-4.5/lib ${STLPORT_LIB} " ac_ext=cpp @@ -22435,7 +22446,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/local/include/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L/usr/local/lib ${STLPORT_LIB} " ac_ext=cpp @@ -22544,7 +22555,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/include/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" ${STLPORT_LIB} " ac_ext=cpp @@ -25593,15 +25604,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Check whether --with-qt was given. -if test "${with_qt+set}" = set; then : - withval=$with_qt; -else - with_qt=yes -fi - - if test x$with_qt = xyes ; then - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTCORE" >&5 @@ -25680,7 +25682,7 @@ fi echo "QT_CFLAGS: $QT_CFLAGS" echo "QT_LIBS: $QT_LIBS" - KDE_INCLUDEDIR="`kde4-config --prefix`/include/kde4 " + KDE_INCLUDEDIR="`kde4-config --path include` " KDE_LIBDIR="`kde4-config --prefix`/lib`kde4-config --libsuffix`/kde4/devel" # Check whether --with-kde-includedir was given. @@ -25794,7 +25796,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi fi have_tested_for_kde=yes @@ -25849,7 +25850,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - PLASMA_INCLUDEDIR=" -I`kde4-config --prefix`/include/kde4/plasma -I`kde4-config --prefix`/include/kde4/KDE " + PLASMA_INCLUDEDIR=" -I`kde4-config --prefix`/include/kde4/plasma -I`kde4-config --prefix`/include/kde4/KDE -I`kde4-config --prefix`/include/KDE " PLASMA_LIBDIR="`kde4-config --prefix`/lib`plasma4-config --libsuffix` " # Check whether --with-plasma-includedir was given. @@ -33267,6 +33268,20 @@ SHAREDPGCTX_LA="" fi + +ZMCTXMODDIR="${absolute_srcdir}/plugins/context/zoneminder/" + +SHAREDZMCTX_LA=" \$(top_builddir)/plugins/context/zoneminder/libferriszoneminder_shared.la " + + + +FERRISRESTCTXMODDIR="${absolute_srcdir}/plugins/context/ferrisrest/" + +SHAREDFERRISRESTCTX_LA=" \$(top_builddir)/plugins/context/ferrisrest/libferrisferrisrest_shared.la " + + + + SHAREDXAPIANMODDIR="${absolute_srcdir}/plugins/fulltextindexers/xapian/" if test x"$have_xapian" = xyes; then @@ -33350,6 +33365,18 @@ CTXIDENTICA_LA=" \$(top_builddir)/plugins/context/identica/libferrisidentica_sha +CTXZONEMINDERDIR="${absolute_srcdir}/plugins/context/zoneminder/" + +CTXZONEMINDER_LA=" \$(top_builddir)/plugins/context/zoneminder/libferriszoneminder_shared.la " + + + +CTXFERRISRESTDIR="${absolute_srcdir}/plugins/context/ferrisrest/" + +CTXFERRISREST_LA=" \$(top_builddir)/plugins/context/ferrisrest/libferrisferrisrest_shared.la " + + + CTXGSTREAMERDIR="${absolute_srcdir}/plugins/context/gstreamer/" CTXGSTREAMER_LA=" \$(top_builddir)/plugins/context/gstreamer/libferrisgstreamer_shared.la " @@ -33714,9 +33741,7 @@ if test x$enable_cgicc != xno; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - extern "C" { - #include - }; + #include int main () @@ -33739,7 +33764,7 @@ rm -f core conftest.err conftest.$ac_objext \ CXXFLAGS=$CXXFLAGS_cache fi -have_cgicc=no +#have_cgicc=no if test x$have_cgicc = xyes; then echo "building cgicc support..." $as_echo "#define HAVE_CGICC 1" >>confdefs.h @@ -34504,15 +34529,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Check whether --with-qt was given. -if test "${with_qt+set}" = set; then : - withval=$with_qt; -else - with_qt=yes -fi - - if test x$with_qt = xyes ; then - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTCORE" >&5 @@ -34591,7 +34607,7 @@ fi echo "QT_CFLAGS: $QT_CFLAGS" echo "QT_LIBS: $QT_LIBS" - KDE_INCLUDEDIR="`kde4-config --prefix`/include/kde4 " + KDE_INCLUDEDIR="`kde4-config --path include` " KDE_LIBDIR="`kde4-config --prefix`/lib`kde4-config --libsuffix`/kde4/devel" # Check whether --with-kde-includedir was given. @@ -34705,7 +34721,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi fi have_tested_for_kde=yes @@ -34756,6 +34771,99 @@ fi + +############ +# moc-qt4 +############ + +# Extract the first word of "moc-qt4", so it can be a program name with args. +set dummy moc-qt4; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_MOC="$MOC" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no " + ;; +esac +fi +MOC=$ac_cv_path_MOC +if test -n "$MOC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 +$as_echo "$MOC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x$MOC = xno; then + # Extract the first word of "moc", so it can be a program name with args. +set dummy moc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_MOC="$MOC" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no " + ;; +esac +fi +MOC=$ac_cv_path_MOC +if test -n "$MOC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 +$as_echo "$MOC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +echo "moc program is at: $MOC" + + + ############ # QtSql ############ @@ -37406,7 +37514,7 @@ REQUIREMENTSXSLT= # # All done. # -ac_config_files="$ac_config_files Makefile ThirdParty/Makefile ThirdParty/internal-xerces-c-headers/Makefile ThirdParty/internal-xerces-c-headers/2.7.0/Makefile ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/2.8.0/Makefile ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/3.0.0/Makefile ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/3.1.0/Makefile ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile ThirdParty/boost/Makefile customalloc/Makefile DBusGlue/Makefile DBusGlue/com.Libferris.Volume.Manager.service DBusGlue/com.libferris.Metadata.Broker.service DBusGlue/com.libferris.Metadata.Worker.xine.service DBusGlue/com.libferris.Metadata.Worker.magick.service DBusGlue/com.libferris.Metadata.Worker.imlib2.service DBusGlue/com.libferris.Metadata.Worker.png.service DBusGlue/com.libferris.Metadata.Worker.jpg.service FerrisGCJ/Makefile mg/Makefile Indexing/Makefile FerrisGlue/Makefile Ferris/Makefile Ferris/BuildDependentMethods.hh Ferris/FerrisSmartPointerChecker.hh Ferris/SchemaSupport.hh dot-ferris/schema.xml FerrisQtGui/Makefile FerrisUI/Makefile fulltextindexers_custom_plugin/Makefile eaindexers_custom_plugin/Makefile apps/Makefile apps/fulltextindex/Makefile apps/importdesktop/Makefile apps/importdesktop/dot-desktop-files/Makefile apps/importdesktop/dot-desktop-files/Graphics/Makefile apps/importdesktop/dot-desktop-files/Multimedia/Makefile apps/fileclip/Makefile apps/fileclip/fclipcopy/Makefile apps/fileclip/fclipcut/Makefile apps/fileclip/fcliplink/Makefile apps/fileclip/fclippaste/Makefile apps/fileclip/fclipredo/Makefile apps/fileclip/fclipundo/Makefile apps/cat/Makefile apps/fcompress/Makefile apps/ai/Makefile apps/namespaces/Makefile apps/cursors/Makefile apps/fmkdir/Makefile apps/fmodestr2octal/Makefile apps/oprocdeamon/Makefile apps/ftouch/Makefile apps/fschema/Makefile apps/fmedallion/Makefile apps/ferriscd/Makefile apps/fca/Makefile apps/ls/Makefile apps/copy/Makefile apps/rm/Makefile apps/mv/Makefile apps/xml/Makefile apps/xml/XSLTransform/Makefile apps/xml/CGITransform/Makefile apps/head/Makefile apps/tail/Makefile apps/fileactions/Makefile apps/ferrisredirect/Makefile apps/rdf/Makefile apps/xmmsdaemon/Makefile apps/metadataserver/Makefile apps/phpsearchinterface/Makefile apps/phpsearchinterface/dhtmlxSuite/Makefile apps/frunner/Makefile apps/volumemanager/Makefile apps/du/Makefile apps/scripts/Makefile apps/upnpserver/Makefile apps/tools/Makefile appsui/Makefile appsui/gfcopy/Makefile appsui/gfrm/Makefile appsui/gfmv/Makefile appsui/gfdl/Makefile appsui/gfproperties/Makefile appsui/gfindex/Makefile appsui/volumemanager/Makefile tests/Makefile tests/contextiostream/Makefile tests/runner/Makefile tests/trivial/Makefile tests/quoting/Makefile tests/sigtoy/Makefile tests/extoy/Makefile tests/comparetoy/Makefile tests/logging/Makefile tests/regression/Makefile tests/regression/relativePaths/Makefile tests/regression/timber/Makefile tests/stringtrimming/Makefile tests/sockets/Makefile tests/sockets/daytime/Makefile tests/sockets/echo/Makefile tests/sockets/echoclienttls/Makefile tests/sockets/echoserver/Makefile tests/sockets/echoservertls/Makefile tests/sockets/socketops/Makefile tests/sqlplus/Makefile tests/sqlplus/simplequery/Makefile tests/streams/Makefile tests/streams/ostream_modifiers/Makefile tests/streams/performance/Makefile tests/medallions/Makefile tests/medallions/simpleroot/Makefile tests/memorymanage/Makefile tests/memorymanage/cleanuptest/Makefile tests/xml/Makefile tests/xml/testMakeDOM/Makefile tests/ipc/Makefile tests/ipc/shm/Makefile tests/ipc/semaphores/Makefile tests/contextiterator/Makefile tests/rdf/Makefile tests/links/Makefile tests/lucene/Makefile tests/timeparsing/Makefile tests/touch/Makefile tests/hiddensymbols/Makefile factories/Makefile factories/eagenerators/Makefile factories/astext/Makefile factories/creation/Makefile plugins/Makefile plugins/context/Makefile plugins/context/commondbapi/Makefile plugins/context/commonsqldbapi/Makefile plugins/context/libmpeg3/Makefile plugins/context/xml/Makefile plugins/context/dbxml/Makefile plugins/context/edb/Makefile plugins/context/dvdread/Makefile plugins/context/nativembox/Makefile plugins/context/sockets/Makefile plugins/context/sqlplus/Makefile plugins/context/ipc/Makefile plugins/context/db4/Makefile plugins/context/eet/Makefile plugins/context/gdbm/Makefile plugins/context/tdb/Makefile plugins/context/spirit/Makefile plugins/context/spirit/ffilter/Makefile plugins/context/spirit/fulltextboolean/Makefile plugins/context/external/Makefile plugins/context/external/mapping.cpp plugins/context/external/extfs_modules/Makefile plugins/context/external/extfs_modules/ssh plugins/context/ldap/Makefile plugins/context/soprano/Makefile plugins/context/dtl/Makefile plugins/context/postgresql/Makefile plugins/context/gphoto2/Makefile plugins/context/evolution/Makefile plugins/context/bibtex/Makefile plugins/context/xwin/Makefile plugins/context/annodex/Makefile plugins/context/emacs/Makefile plugins/context/emacs/libferrisemacs.hh plugins/context/firefox/Makefile plugins/context/firefox/firefox-extension/Makefile plugins/context/obby/Makefile plugins/context/xsltfs/Makefile plugins/context/xmms/Makefile plugins/context/amarok/Makefile plugins/context/dbus/Makefile plugins/context/hal/Makefile plugins/context/qtsql/Makefile plugins/context/recordfile/Makefile plugins/context/google/Makefile plugins/context/facebook/Makefile plugins/context/vimeo/Makefile plugins/context/identica/Makefile plugins/context/gstreamer/Makefile plugins/context/upnp/Makefile plugins/context/webphotos/Makefile plugins/context/qtftp/Makefile plugins/context/qthttp/Makefile plugins/context/plasma/Makefile plugins/context/sane/Makefile plugins/context/printer/Makefile plugins/context/pulseaudio/Makefile plugins/context/wiki/Makefile plugins/context/pastebin/Makefile plugins/eagenerators/Makefile plugins/eagenerators/jasper/Makefile plugins/eagenerators/id3/Makefile plugins/eagenerators/imlib2/Makefile plugins/eagenerators/magick/Makefile plugins/eagenerators/png/Makefile plugins/eagenerators/djvu/Makefile plugins/eagenerators/jpeg/Makefile plugins/eagenerators/libmpeg3/Makefile plugins/eagenerators/gimp/Makefile plugins/eagenerators/xfsnative/Makefile plugins/eagenerators/a52/Makefile plugins/eagenerators/mpeg2/Makefile plugins/eagenerators/soprano/Makefile plugins/eagenerators/exif/Makefile plugins/eagenerators/xmp/Makefile plugins/eagenerators/libextractor/Makefile plugins/eagenerators/kde3metadata/Makefile plugins/eagenerators/xine/Makefile plugins/eagenerators/fspot/Makefile plugins/eagenerators/strigi/Makefile plugins/eagenerators/flac/Makefile plugins/eagenerators/oggz/Makefile plugins/eagenerators/taglib/Makefile plugins/eagenerators/mediainfo/Makefile plugins/eagenerators/subtitles/Makefile plugins/astext/Makefile plugins/astext/pdf/Makefile plugins/astext/html/Makefile plugins/astext/man/Makefile plugins/astext/djvu/Makefile plugins/astext/msdoc/Makefile plugins/astext/extern/Makefile plugins/creation/Makefile plugins/creation/db4/Makefile plugins/creation/dbxml/Makefile plugins/creation/devsource/Makefile plugins/creation/fulltextindex/Makefile plugins/creation/fulltextindexgeneric/Makefile plugins/creation/eaindex/Makefile plugins/creation/eaindexgeneric/Makefile plugins/creation/gdbm/Makefile plugins/creation/magickimage/Makefile plugins/creation/markup/Makefile plugins/creation/mng/Makefile plugins/creation/mp3/Makefile plugins/creation/mpeg2/Makefile plugins/creation/ogg/Makefile plugins/creation/shellscript/Makefile plugins/creation/tdb/Makefile plugins/creation/wav/Makefile plugins/creation/soprano/Makefile plugins/eaindexers/Makefile plugins/eaindexers/ldap/Makefile plugins/eaindexers/lucene/Makefile plugins/eaindexers/clucene/Makefile plugins/eaindexers/odbc/Makefile plugins/eaindexers/qtsql/Makefile plugins/eaindexers/postgresql/Makefile plugins/eaindexers/soprano/Makefile plugins/eaindexers/xapian/Makefile plugins/eaindexers/null/Makefile plugins/eaindexers/federation/Makefile plugins/eaindexers/boost/Makefile plugins/fulltextindexers/Makefile plugins/fulltextindexers/lucene/Makefile plugins/fulltextindexers/clucene/Makefile plugins/fulltextindexers/odbc/Makefile plugins/fulltextindexers/qtsql/Makefile plugins/fulltextindexers/xapian/Makefile plugins/fulltextindexers/tsearch2/Makefile plugins/fulltextindexers/yahoo/Makefile plugins/fulltextindexers/external/Makefile plugins/fulltextindexers/beagle/Makefile plugins/fulltextindexers/null/Makefile plugins/fulltextindexers/uniqsorted/Makefile plugins/fulltextindexers/strigi/Makefile dot-ferris/Makefile dot-ferris/licenses/Makefile dot-ferris/full-text-index/Makefile dot-ferris/ea-index/Makefile dot-ferris/tmp/Makefile dot-ferris/etagere/Makefile dot-ferris/rdfdb/Makefile dot-ferris/sane/Makefile dot-ferris/sane/dot-discovered/Makefile dot-ferris/sane/dot-discovered/color-100/Makefile dot-ferris/sane/dot-discovered/color-300/Makefile dot-ferris/sane/dot-discovered/color-600/Makefile dot-ferris/sane/dot-discovered/color-base/Makefile dot-ferris/sane/dot-discovered/gray-100/Makefile dot-ferris/sane/dot-discovered/gray-300/Makefile dot-ferris/sane/dot-discovered/gray-600/Makefile dot-ferris/sane/dot-discovered/gray-base/Makefile dot-ferris/sane/dot-discovered/color-100/options/Makefile dot-ferris/sane/dot-discovered/color-300/options/Makefile dot-ferris/sane/dot-discovered/color-600/options/Makefile dot-ferris/sane/dot-discovered/color-base/options/Makefile dot-ferris/sane/dot-discovered/gray-100/options/Makefile dot-ferris/sane/dot-discovered/gray-300/options/Makefile dot-ferris/sane/dot-discovered/gray-600/options/Makefile dot-ferris/sane/dot-discovered/gray-base/options/Makefile media/Makefile media/icons/Makefile media/xslt/Makefile cc/Makefile cc/Ferris/Makefile cc/capplets/Makefile cc/capplets/curl-ftp/Makefile cc/capplets/logging/Makefile cc/capplets/locale/Makefile cc/capplets/auth/Makefile cc/capplets/version/Makefile cc/capplets/version/ferris-capplet-version.hh cc/capplets/general/Makefile cc/capplets/index/Makefile cc/capplets/medallion/Makefile cc/capplets/agents/Makefile cc/capplets/thumbnails/Makefile cc/capplets/rdf/Makefile cc/Ferris/curl-ftp.desktop cc/Ferris/locale.desktop cc/Ferris/logging.desktop cc/Ferris/auth.desktop cc/Ferris/version.desktop cc/Ferris/medallion.desktop cc/Ferris/indexing.desktop cc/Ferris/general.desktop cc/Ferris/agents.desktop cc/Ferris/thumbnails.desktop firsttime/Makefile firsttime/console/Makefile firsttime/ui/Makefile xsltfunctions/Makefile noarch/Makefile migration/Makefile perl/Makefile exposures/Makefile exposures/sqlitevtab/Makefile exposures/plasma/Makefile exposures/perl/Makefile patches/Makefile ferris-config ferris.pc ferrisui.pc ferrisxslt.pc" +ac_config_files="$ac_config_files Makefile ThirdParty/Makefile ThirdParty/internal-xerces-c-headers/Makefile ThirdParty/internal-xerces-c-headers/2.7.0/Makefile ThirdParty/internal-xerces-c-headers/2.7.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/2.8.0/Makefile ThirdParty/internal-xerces-c-headers/2.8.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/3.0.0/Makefile ThirdParty/internal-xerces-c-headers/3.0.0/xerces/Makefile ThirdParty/internal-xerces-c-headers/3.1.0/Makefile ThirdParty/internal-xerces-c-headers/3.1.0/xerces/Makefile ThirdParty/boost/Makefile customalloc/Makefile DBusGlue/Makefile DBusGlue/com.Libferris.Volume.Manager.service DBusGlue/com.libferris.Metadata.Broker.service DBusGlue/com.libferris.Metadata.Worker.xine.service DBusGlue/com.libferris.Metadata.Worker.magick.service DBusGlue/com.libferris.Metadata.Worker.imlib2.service DBusGlue/com.libferris.Metadata.Worker.png.service DBusGlue/com.libferris.Metadata.Worker.jpg.service FerrisGCJ/Makefile mg/Makefile Indexing/Makefile FerrisGlue/Makefile Ferris/Makefile Ferris/BuildDependentMethods.hh Ferris/FerrisSmartPointerChecker.hh Ferris/SchemaSupport.hh dot-ferris/schema.xml FerrisQtGui/Makefile FerrisUI/Makefile fulltextindexers_custom_plugin/Makefile eaindexers_custom_plugin/Makefile apps/Makefile apps/fulltextindex/Makefile apps/importdesktop/Makefile apps/importdesktop/dot-desktop-files/Makefile apps/importdesktop/dot-desktop-files/Graphics/Makefile apps/importdesktop/dot-desktop-files/Multimedia/Makefile apps/fileclip/Makefile apps/fileclip/fclipcopy/Makefile apps/fileclip/fclipcut/Makefile apps/fileclip/fcliplink/Makefile apps/fileclip/fclippaste/Makefile apps/fileclip/fclipredo/Makefile apps/fileclip/fclipundo/Makefile apps/cat/Makefile apps/fcompress/Makefile apps/ai/Makefile apps/namespaces/Makefile apps/cursors/Makefile apps/fmkdir/Makefile apps/fmodestr2octal/Makefile apps/oprocdeamon/Makefile apps/ftouch/Makefile apps/fschema/Makefile apps/fmedallion/Makefile apps/ferriscd/Makefile apps/fca/Makefile apps/ls/Makefile apps/copy/Makefile apps/rm/Makefile apps/mv/Makefile apps/xml/Makefile apps/xml/XSLTransform/Makefile apps/xml/CGITransform/Makefile apps/head/Makefile apps/tail/Makefile apps/fileactions/Makefile apps/ferrisredirect/Makefile apps/rdf/Makefile apps/xmmsdaemon/Makefile apps/metadataserver/Makefile apps/phpsearchinterface/Makefile apps/phpsearchinterface/dhtmlxSuite/Makefile apps/frunner/Makefile apps/volumemanager/Makefile apps/du/Makefile apps/scripts/Makefile apps/upnpserver/Makefile apps/tools/Makefile apps/rest/Makefile appsui/Makefile appsui/gfcopy/Makefile appsui/gfrm/Makefile appsui/gfmv/Makefile appsui/gfdl/Makefile appsui/gfproperties/Makefile appsui/gfindex/Makefile appsui/volumemanager/Makefile tests/Makefile tests/contextiostream/Makefile tests/runner/Makefile tests/trivial/Makefile tests/quoting/Makefile tests/sigtoy/Makefile tests/extoy/Makefile tests/comparetoy/Makefile tests/logging/Makefile tests/regression/Makefile tests/regression/relativePaths/Makefile tests/regression/timber/Makefile tests/stringtrimming/Makefile tests/sockets/Makefile tests/sockets/daytime/Makefile tests/sockets/echo/Makefile tests/sockets/echoclienttls/Makefile tests/sockets/echoserver/Makefile tests/sockets/echoservertls/Makefile tests/sockets/socketops/Makefile tests/sqlplus/Makefile tests/sqlplus/simplequery/Makefile tests/streams/Makefile tests/streams/ostream_modifiers/Makefile tests/streams/performance/Makefile tests/medallions/Makefile tests/medallions/simpleroot/Makefile tests/memorymanage/Makefile tests/memorymanage/cleanuptest/Makefile tests/xml/Makefile tests/xml/testMakeDOM/Makefile tests/ipc/Makefile tests/ipc/shm/Makefile tests/ipc/semaphores/Makefile tests/contextiterator/Makefile tests/rdf/Makefile tests/links/Makefile tests/lucene/Makefile tests/timeparsing/Makefile tests/touch/Makefile tests/hiddensymbols/Makefile factories/Makefile factories/eagenerators/Makefile factories/astext/Makefile factories/creation/Makefile plugins/Makefile plugins/context/Makefile plugins/context/commondbapi/Makefile plugins/context/commonsqldbapi/Makefile plugins/context/libmpeg3/Makefile plugins/context/xml/Makefile plugins/context/dbxml/Makefile plugins/context/edb/Makefile plugins/context/dvdread/Makefile plugins/context/nativembox/Makefile plugins/context/sockets/Makefile plugins/context/sqlplus/Makefile plugins/context/ipc/Makefile plugins/context/db4/Makefile plugins/context/eet/Makefile plugins/context/gdbm/Makefile plugins/context/tdb/Makefile plugins/context/spirit/Makefile plugins/context/spirit/ffilter/Makefile plugins/context/spirit/fulltextboolean/Makefile plugins/context/external/Makefile plugins/context/external/mapping.cpp plugins/context/external/extfs_modules/Makefile plugins/context/external/extfs_modules/ssh plugins/context/ldap/Makefile plugins/context/soprano/Makefile plugins/context/dtl/Makefile plugins/context/postgresql/Makefile plugins/context/gphoto2/Makefile plugins/context/evolution/Makefile plugins/context/bibtex/Makefile plugins/context/xwin/Makefile plugins/context/annodex/Makefile plugins/context/emacs/Makefile plugins/context/emacs/libferrisemacs.hh plugins/context/firefox/Makefile plugins/context/firefox/firefox-extension/Makefile plugins/context/obby/Makefile plugins/context/xsltfs/Makefile plugins/context/xmms/Makefile plugins/context/amarok/Makefile plugins/context/dbus/Makefile plugins/context/hal/Makefile plugins/context/qtsql/Makefile plugins/context/recordfile/Makefile plugins/context/google/Makefile plugins/context/facebook/Makefile plugins/context/vimeo/Makefile plugins/context/identica/Makefile plugins/context/gstreamer/Makefile plugins/context/upnp/Makefile plugins/context/webphotos/Makefile plugins/context/qtftp/Makefile plugins/context/qthttp/Makefile plugins/context/plasma/Makefile plugins/context/sane/Makefile plugins/context/printer/Makefile plugins/context/pulseaudio/Makefile plugins/context/wiki/Makefile plugins/context/pastebin/Makefile plugins/context/zoneminder/Makefile plugins/context/ferrisrest/Makefile plugins/eagenerators/Makefile plugins/eagenerators/jasper/Makefile plugins/eagenerators/id3/Makefile plugins/eagenerators/imlib2/Makefile plugins/eagenerators/magick/Makefile plugins/eagenerators/png/Makefile plugins/eagenerators/djvu/Makefile plugins/eagenerators/jpeg/Makefile plugins/eagenerators/libmpeg3/Makefile plugins/eagenerators/gimp/Makefile plugins/eagenerators/xfsnative/Makefile plugins/eagenerators/a52/Makefile plugins/eagenerators/mpeg2/Makefile plugins/eagenerators/soprano/Makefile plugins/eagenerators/exif/Makefile plugins/eagenerators/xmp/Makefile plugins/eagenerators/libextractor/Makefile plugins/eagenerators/kde3metadata/Makefile plugins/eagenerators/xine/Makefile plugins/eagenerators/fspot/Makefile plugins/eagenerators/strigi/Makefile plugins/eagenerators/flac/Makefile plugins/eagenerators/oggz/Makefile plugins/eagenerators/taglib/Makefile plugins/eagenerators/mediainfo/Makefile plugins/eagenerators/subtitles/Makefile plugins/astext/Makefile plugins/astext/pdf/Makefile plugins/astext/html/Makefile plugins/astext/man/Makefile plugins/astext/djvu/Makefile plugins/astext/msdoc/Makefile plugins/astext/extern/Makefile plugins/creation/Makefile plugins/creation/db4/Makefile plugins/creation/dbxml/Makefile plugins/creation/devsource/Makefile plugins/creation/fulltextindex/Makefile plugins/creation/fulltextindexgeneric/Makefile plugins/creation/eaindex/Makefile plugins/creation/eaindexgeneric/Makefile plugins/creation/gdbm/Makefile plugins/creation/magickimage/Makefile plugins/creation/markup/Makefile plugins/creation/mng/Makefile plugins/creation/mp3/Makefile plugins/creation/mpeg2/Makefile plugins/creation/ogg/Makefile plugins/creation/shellscript/Makefile plugins/creation/tdb/Makefile plugins/creation/wav/Makefile plugins/creation/soprano/Makefile plugins/eaindexers/Makefile plugins/eaindexers/ldap/Makefile plugins/eaindexers/lucene/Makefile plugins/eaindexers/clucene/Makefile plugins/eaindexers/odbc/Makefile plugins/eaindexers/qtsql/Makefile plugins/eaindexers/postgresql/Makefile plugins/eaindexers/soprano/Makefile plugins/eaindexers/xapian/Makefile plugins/eaindexers/null/Makefile plugins/eaindexers/federation/Makefile plugins/eaindexers/boost/Makefile plugins/fulltextindexers/Makefile plugins/fulltextindexers/lucene/Makefile plugins/fulltextindexers/clucene/Makefile plugins/fulltextindexers/odbc/Makefile plugins/fulltextindexers/qtsql/Makefile plugins/fulltextindexers/xapian/Makefile plugins/fulltextindexers/tsearch2/Makefile plugins/fulltextindexers/yahoo/Makefile plugins/fulltextindexers/external/Makefile plugins/fulltextindexers/beagle/Makefile plugins/fulltextindexers/null/Makefile plugins/fulltextindexers/uniqsorted/Makefile plugins/fulltextindexers/strigi/Makefile dot-ferris/Makefile dot-ferris/licenses/Makefile dot-ferris/full-text-index/Makefile dot-ferris/ea-index/Makefile dot-ferris/tmp/Makefile dot-ferris/etagere/Makefile dot-ferris/rdfdb/Makefile dot-ferris/sane/Makefile dot-ferris/sane/dot-discovered/Makefile dot-ferris/sane/dot-discovered/color-100/Makefile dot-ferris/sane/dot-discovered/color-300/Makefile dot-ferris/sane/dot-discovered/color-600/Makefile dot-ferris/sane/dot-discovered/color-base/Makefile dot-ferris/sane/dot-discovered/gray-100/Makefile dot-ferris/sane/dot-discovered/gray-300/Makefile dot-ferris/sane/dot-discovered/gray-600/Makefile dot-ferris/sane/dot-discovered/gray-base/Makefile dot-ferris/sane/dot-discovered/color-100/options/Makefile dot-ferris/sane/dot-discovered/color-300/options/Makefile dot-ferris/sane/dot-discovered/color-600/options/Makefile dot-ferris/sane/dot-discovered/color-base/options/Makefile dot-ferris/sane/dot-discovered/gray-100/options/Makefile dot-ferris/sane/dot-discovered/gray-300/options/Makefile dot-ferris/sane/dot-discovered/gray-600/options/Makefile dot-ferris/sane/dot-discovered/gray-base/options/Makefile media/Makefile media/icons/Makefile media/xslt/Makefile cc/Makefile cc/Ferris/Makefile cc/capplets/Makefile cc/capplets/curl-ftp/Makefile cc/capplets/logging/Makefile cc/capplets/locale/Makefile cc/capplets/auth/Makefile cc/capplets/version/Makefile cc/capplets/version/ferris-capplet-version.hh cc/capplets/general/Makefile cc/capplets/index/Makefile cc/capplets/medallion/Makefile cc/capplets/agents/Makefile cc/capplets/thumbnails/Makefile cc/capplets/rdf/Makefile cc/Ferris/curl-ftp.desktop cc/Ferris/locale.desktop cc/Ferris/logging.desktop cc/Ferris/auth.desktop cc/Ferris/version.desktop cc/Ferris/medallion.desktop cc/Ferris/indexing.desktop cc/Ferris/general.desktop cc/Ferris/agents.desktop cc/Ferris/thumbnails.desktop firsttime/Makefile firsttime/console/Makefile firsttime/ui/Makefile xsltfunctions/Makefile noarch/Makefile migration/Makefile perl/Makefile exposures/Makefile exposures/sqlitevtab/Makefile exposures/plasma/Makefile exposures/perl/Makefile patches/Makefile ferris-config ferris.pc ferrisui.pc ferrisxslt.pc" ac_config_commands="$ac_config_commands default" @@ -38448,7 +38556,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libferris $as_me 1.5.13, which was +This file was extended by libferris $as_me 1.5.14, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38514,7 +38622,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libferris config.status 1.5.13 +libferris config.status 1.5.14 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -39194,6 +39302,7 @@ do "apps/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES apps/scripts/Makefile" ;; "apps/upnpserver/Makefile") CONFIG_FILES="$CONFIG_FILES apps/upnpserver/Makefile" ;; "apps/tools/Makefile") CONFIG_FILES="$CONFIG_FILES apps/tools/Makefile" ;; + "apps/rest/Makefile") CONFIG_FILES="$CONFIG_FILES apps/rest/Makefile" ;; "appsui/Makefile") CONFIG_FILES="$CONFIG_FILES appsui/Makefile" ;; "appsui/gfcopy/Makefile") CONFIG_FILES="$CONFIG_FILES appsui/gfcopy/Makefile" ;; "appsui/gfrm/Makefile") CONFIG_FILES="$CONFIG_FILES appsui/gfrm/Makefile" ;; @@ -39307,6 +39416,8 @@ do "plugins/context/pulseaudio/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/context/pulseaudio/Makefile" ;; "plugins/context/wiki/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/context/wiki/Makefile" ;; "plugins/context/pastebin/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/context/pastebin/Makefile" ;; + "plugins/context/zoneminder/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/context/zoneminder/Makefile" ;; + "plugins/context/ferrisrest/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/context/ferrisrest/Makefile" ;; "plugins/eagenerators/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/eagenerators/Makefile" ;; "plugins/eagenerators/jasper/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/eagenerators/jasper/Makefile" ;; "plugins/eagenerators/id3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/eagenerators/id3/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9d9af84..8f6c7d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ PACKAGE=libferris -AC_INIT(libferris, 1.5.13) -LIBFERRIS_BETA=13 +AC_INIT(libferris, 1.5.14) +LIBFERRIS_BETA=14 LIBFERRIS_MINOR=5 LIBFERRIS_MAJOR=1 @@ -15,6 +15,7 @@ AC_SUBST(FERRIS_VERSION) AC_DEFINE_UNQUOTED(FERRIS_VERSION, "$FERRIS_VERSION" ) VERSION=$FERRIS_VERSION +AC_DEFINE_UNQUOTED(VERSION, "$VERSION" ) AC_CONFIG_SRCDIR(Ferris/Ferris.cpp) AM_CONFIG_HEADER(config.h) @@ -3073,6 +3074,20 @@ SHAREDPGCTX_LA="" fi AC_SUBST(SHAREDPGCTX_LA) + +ZMCTXMODDIR="${absolute_srcdir}/plugins/context/zoneminder/" +AC_SUBST(ZMCTXMODDIR) +SHAREDZMCTX_LA=" \$(top_builddir)/plugins/context/zoneminder/libferriszoneminder_shared.la " +AC_SUBST(SHAREDZMCTX_LA) + + +FERRISRESTCTXMODDIR="${absolute_srcdir}/plugins/context/ferrisrest/" +AC_SUBST(FERRISRESTCTXMODDIR) +SHAREDFERRISRESTCTX_LA=" \$(top_builddir)/plugins/context/ferrisrest/libferrisferrisrest_shared.la " +AC_SUBST(SHAREDFERRISRESTCTX_LA) + + + SHAREDXAPIANMODDIR="${absolute_srcdir}/plugins/fulltextindexers/xapian/" AC_SUBST(SHAREDXAPIANMODDIR) if test x"$have_xapian" = xyes; then @@ -3164,6 +3179,18 @@ CTXIDENTICA_LA=" \$(top_builddir)/plugins/context/identica/libferrisidentica_sha AC_SUBST(CTXIDENTICA_LA) +CTXZONEMINDERDIR="${absolute_srcdir}/plugins/context/zoneminder/" +AC_SUBST(CTXZONEMINDERDIR) +CTXZONEMINDER_LA=" \$(top_builddir)/plugins/context/zoneminder/libferriszoneminder_shared.la " +AC_SUBST(CTXZONEMINDER_LA) + + +CTXFERRISRESTDIR="${absolute_srcdir}/plugins/context/ferrisrest/" +AC_SUBST(CTXFERRISRESTDIR) +CTXFERRISREST_LA=" \$(top_builddir)/plugins/context/ferrisrest/libferrisferrisrest_shared.la " +AC_SUBST(CTXFERRISREST_LA) + + CTXGSTREAMERDIR="${absolute_srcdir}/plugins/context/gstreamer/" AC_SUBST(CTXGSTREAMERDIR) CTXGSTREAMER_LA=" \$(top_builddir)/plugins/context/gstreamer/libferrisgstreamer_shared.la " @@ -3415,9 +3442,7 @@ if test x$enable_cgicc != xno; then LDFLAGS=" $LDFLAGS $CGICC_LIBS " AC_TRY_LINK([ - extern "C" { - #include - }; + #include ], [ cgicc::Cgicc cgi; @@ -3427,7 +3452,7 @@ if test x$enable_cgicc != xno; then CXXFLAGS=$CXXFLAGS_cache fi -have_cgicc=no +#have_cgicc=no if test x$have_cgicc = xyes; then echo "building cgicc support..." AC_DEFINE(HAVE_CGICC) @@ -3883,6 +3908,19 @@ AM_CONDITIONAL(FERRIS_BUILD_KDE_EAGENERATOR, test x"$build_kde_eagenerator" = xy AC_SUBST(KDE_EAGENERATOR_CFLAGS) AC_SUBST(KDE_EAGENERATOR_LIBS) + +############ +# moc-qt4 +############ + +AC_PATH_PROG( MOC, moc-qt4, [no] ) +if test x$MOC = xno; then + AC_PATH_PROG( MOC, moc, [no] ) +fi +echo "moc program is at: $MOC" +AC_SUBST(MOC) + + ############ # QtSql ############ @@ -4969,6 +5007,7 @@ apps/du/Makefile apps/scripts/Makefile apps/upnpserver/Makefile apps/tools/Makefile +apps/rest/Makefile appsui/Makefile appsui/gfcopy/Makefile appsui/gfrm/Makefile @@ -5082,6 +5121,8 @@ plugins/context/printer/Makefile plugins/context/pulseaudio/Makefile plugins/context/wiki/Makefile plugins/context/pastebin/Makefile +plugins/context/zoneminder/Makefile +plugins/context/ferrisrest/Makefile plugins/eagenerators/Makefile plugins/eagenerators/jasper/Makefile plugins/eagenerators/id3/Makefile diff --git a/customalloc/Makefile.in b/customalloc/Makefile.in index 5d6a127..a3e3b6d 100644 --- a/customalloc/Makefile.in +++ b/customalloc/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/Makefile.in b/dot-ferris/Makefile.in index 2b66dc3..2f645df 100644 --- a/dot-ferris/Makefile.in +++ b/dot-ferris/Makefile.in @@ -156,6 +156,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -164,6 +166,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -219,6 +223,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -453,6 +458,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -525,6 +531,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -536,6 +543,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -615,6 +623,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/ea-index/Makefile.in b/dot-ferris/ea-index/Makefile.in index 2edc344..905e88d 100644 --- a/dot-ferris/ea-index/Makefile.in +++ b/dot-ferris/ea-index/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/etagere/Makefile.in b/dot-ferris/etagere/Makefile.in index 369489a..d30c9db 100644 --- a/dot-ferris/etagere/Makefile.in +++ b/dot-ferris/etagere/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/full-text-index/Makefile.in b/dot-ferris/full-text-index/Makefile.in index 1b0e437..47fb4d9 100644 --- a/dot-ferris/full-text-index/Makefile.in +++ b/dot-ferris/full-text-index/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/licenses/Makefile.in b/dot-ferris/licenses/Makefile.in index 9c87152..89ae7a3 100644 --- a/dot-ferris/licenses/Makefile.in +++ b/dot-ferris/licenses/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/rdfdb/Makefile.in b/dot-ferris/rdfdb/Makefile.in index b0d637f..7958799 100644 --- a/dot-ferris/rdfdb/Makefile.in +++ b/dot-ferris/rdfdb/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/Makefile.in b/dot-ferris/sane/Makefile.in index 0e5e3a9..deabcf7 100644 --- a/dot-ferris/sane/Makefile.in +++ b/dot-ferris/sane/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/Makefile.in b/dot-ferris/sane/dot-discovered/Makefile.in index 2e3fc45..641feac 100644 --- a/dot-ferris/sane/dot-discovered/Makefile.in +++ b/dot-ferris/sane/dot-discovered/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-100/Makefile.in b/dot-ferris/sane/dot-discovered/color-100/Makefile.in index 53ff32a..70d93b9 100644 --- a/dot-ferris/sane/dot-discovered/color-100/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-100/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-100/options/Makefile.in b/dot-ferris/sane/dot-discovered/color-100/options/Makefile.in index 16f651b..5efacc9 100644 --- a/dot-ferris/sane/dot-discovered/color-100/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-100/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-300/Makefile.in b/dot-ferris/sane/dot-discovered/color-300/Makefile.in index 2bf74ac..e7c2589 100644 --- a/dot-ferris/sane/dot-discovered/color-300/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-300/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-300/options/Makefile.in b/dot-ferris/sane/dot-discovered/color-300/options/Makefile.in index 8107025..6035c7d 100644 --- a/dot-ferris/sane/dot-discovered/color-300/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-300/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-600/Makefile.in b/dot-ferris/sane/dot-discovered/color-600/Makefile.in index c5c3b13..5877ed7 100644 --- a/dot-ferris/sane/dot-discovered/color-600/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-600/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-600/options/Makefile.in b/dot-ferris/sane/dot-discovered/color-600/options/Makefile.in index 7d295ab..b94316f 100644 --- a/dot-ferris/sane/dot-discovered/color-600/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-600/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-base/Makefile.in b/dot-ferris/sane/dot-discovered/color-base/Makefile.in index ba6fdf3..8c1f162 100644 --- a/dot-ferris/sane/dot-discovered/color-base/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-base/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/color-base/options/Makefile.in b/dot-ferris/sane/dot-discovered/color-base/options/Makefile.in index e849ca7..9dcc4d0 100644 --- a/dot-ferris/sane/dot-discovered/color-base/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/color-base/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-100/Makefile.in b/dot-ferris/sane/dot-discovered/gray-100/Makefile.in index 377a8ae..fe30f15 100644 --- a/dot-ferris/sane/dot-discovered/gray-100/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-100/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-100/options/Makefile.in b/dot-ferris/sane/dot-discovered/gray-100/options/Makefile.in index 5fe9635..9021251 100644 --- a/dot-ferris/sane/dot-discovered/gray-100/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-100/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-300/Makefile.in b/dot-ferris/sane/dot-discovered/gray-300/Makefile.in index 68088f3..e7c79a3 100644 --- a/dot-ferris/sane/dot-discovered/gray-300/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-300/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-300/options/Makefile.in b/dot-ferris/sane/dot-discovered/gray-300/options/Makefile.in index 32e8411..5292756 100644 --- a/dot-ferris/sane/dot-discovered/gray-300/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-300/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-600/Makefile.in b/dot-ferris/sane/dot-discovered/gray-600/Makefile.in index e8651be..46cac32 100644 --- a/dot-ferris/sane/dot-discovered/gray-600/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-600/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-600/options/Makefile.in b/dot-ferris/sane/dot-discovered/gray-600/options/Makefile.in index 0288778..3fd05e9 100644 --- a/dot-ferris/sane/dot-discovered/gray-600/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-600/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-base/Makefile.in b/dot-ferris/sane/dot-discovered/gray-base/Makefile.in index 10b2a43..c523f7a 100644 --- a/dot-ferris/sane/dot-discovered/gray-base/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-base/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/sane/dot-discovered/gray-base/options/Makefile.in b/dot-ferris/sane/dot-discovered/gray-base/options/Makefile.in index 64a8ba0..14d96e4 100644 --- a/dot-ferris/sane/dot-discovered/gray-base/options/Makefile.in +++ b/dot-ferris/sane/dot-discovered/gray-base/options/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/dot-ferris/tmp/Makefile.in b/dot-ferris/tmp/Makefile.in index 954740e..9483574 100644 --- a/dot-ferris/tmp/Makefile.in +++ b/dot-ferris/tmp/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/eaindexers_custom_plugin/Makefile.in b/eaindexers_custom_plugin/Makefile.in index 87bc45b..f3b4030 100644 --- a/eaindexers_custom_plugin/Makefile.in +++ b/eaindexers_custom_plugin/Makefile.in @@ -158,6 +158,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -166,6 +168,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -221,6 +225,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -455,6 +460,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -527,6 +533,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -538,6 +545,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -617,6 +625,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/exposures/Makefile.in b/exposures/Makefile.in index f16ba47..78bf1d5 100644 --- a/exposures/Makefile.in +++ b/exposures/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/exposures/perl/Makefile.in b/exposures/perl/Makefile.in index 1738633..1278049 100644 --- a/exposures/perl/Makefile.in +++ b/exposures/perl/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/exposures/plasma/Makefile.am b/exposures/plasma/Makefile.am index 922bfb5..e845394 100644 --- a/exposures/plasma/Makefile.am +++ b/exposures/plasma/Makefile.am @@ -11,7 +11,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ INCLUDES = \ @STLPORT_CFLAGS@ \ diff --git a/exposures/plasma/Makefile.in b/exposures/plasma/Makefile.in index 0db8b28..9816cca 100644 --- a/exposures/plasma/Makefile.in +++ b/exposures/plasma/Makefile.in @@ -151,6 +151,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -159,6 +161,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -214,6 +218,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -448,6 +453,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -520,6 +526,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -531,6 +538,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -610,6 +618,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1061,7 +1070,7 @@ uninstall-am: uninstall-desktopDATA uninstall-operationsDATA \ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/exposures/sqlitevtab/Makefile.in b/exposures/sqlitevtab/Makefile.in index 2285524..7b302cd 100644 --- a/exposures/sqlitevtab/Makefile.in +++ b/exposures/sqlitevtab/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/factories/Makefile.in b/factories/Makefile.in index 4b1fa80..5a98029 100644 --- a/factories/Makefile.in +++ b/factories/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/factories/astext/Makefile.in b/factories/astext/Makefile.in index c5faf7a..a1179d8 100644 --- a/factories/astext/Makefile.in +++ b/factories/astext/Makefile.in @@ -124,6 +124,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -132,6 +134,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -187,6 +191,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -421,6 +426,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -493,6 +499,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -504,6 +511,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -583,6 +591,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/factories/creation/Makefile.in b/factories/creation/Makefile.in index c74efe2..b8c84fa 100644 --- a/factories/creation/Makefile.in +++ b/factories/creation/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/factories/eagenerators/Makefile.in b/factories/eagenerators/Makefile.in index 90459b0..50051ee 100644 --- a/factories/eagenerators/Makefile.in +++ b/factories/eagenerators/Makefile.in @@ -166,6 +166,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -174,6 +176,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -229,6 +233,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -463,6 +468,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -535,6 +541,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -546,6 +553,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -625,6 +633,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ferris.pc b/ferris.pc index bc842a9..9eb2100 100644 --- a/ferris.pc +++ b/ferris.pc @@ -5,11 +5,11 @@ includedir=${prefix}/include Name: ferris Description: Virtual filesystem -Version: 1.5.13 +Version: 1.5.14 Requires: stldb4 Libs: -lfam -L/usr/local/lib64 -lfampp -lferrisloki -lsigc-2.0 -lcrypto -lssl -lboost_wserialization -lboost_serialization -lboost_regex -L/usr/local/lib64 -lferrisloki -lsigc-2.0 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lferrisstreams -lferrisloki -lsigc-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxerces-c -lxerces-c -lxalan-c -pthread -lgnomevfs-2 -lgconf-2 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lQtCore -lQtNetwork -lQtCore -L/usr/lib64/kde4/devel -lkdeui -lkdecore -lQtCore -lssl -lcrypto -lz -lbz2 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lstldb4 -lpthread -lferrisstreams -lferrisloki -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lsigc-2.0 -lsigc-2.0 -lsoprano -lQtCore -lsopranoclient -lpopt -lferris -lgpgme -Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore +Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4/ -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore diff --git a/ferrisui.pc b/ferrisui.pc index 7079744..4e97435 100644 --- a/ferrisui.pc +++ b/ferrisui.pc @@ -5,11 +5,11 @@ includedir=${prefix}/include Name: ferrisui Description: GTK+2 GUI helper code for ferris Virtual filesystem -Version: 1.5.13 +Version: 1.5.14 Requires: Libs: -lfam -L/usr/local/lib64 -lfampp -lferrisloki -lsigc-2.0 -lcrypto -lssl -lboost_wserialization -lboost_serialization -lboost_regex -L/usr/local/lib64 -lferrisloki -lsigc-2.0 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lferrisstreams -lferrisloki -lsigc-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxerces-c -lxerces-c -lxalan-c -pthread -lgnomevfs-2 -lgconf-2 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lQtCore -lQtNetwork -lQtCore -L/usr/lib64/kde4/devel -lkdeui -lkdecore -lQtCore -lssl -lcrypto -lz -lbz2 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lstldb4 -lpthread -lferrisstreams -lferrisloki -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lsigc-2.0 -lsigc-2.0 -lsoprano -lQtCore -lsopranoclient -lpopt -lferris -lgpgme -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lferrisui -Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 +Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4/ -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 diff --git a/ferrisxslt.pc b/ferrisxslt.pc index 732e78a..de5e10e 100644 --- a/ferrisxslt.pc +++ b/ferrisxslt.pc @@ -5,11 +5,11 @@ includedir=${prefix}/include Name: ferrisxslt Description: XSLT functions for processing XML with ferris -Version: 1.5.13 +Version: 1.5.14 Requires: Libs: -lfam -L/usr/local/lib64 -lfampp -lferrisloki -lsigc-2.0 -lcrypto -lssl -lboost_wserialization -lboost_serialization -lboost_regex -L/usr/local/lib64 -lferrisloki -lsigc-2.0 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lferrisstreams -lferrisloki -lsigc-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxerces-c -lxerces-c -lxalan-c -pthread -lgnomevfs-2 -lgconf-2 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lQtCore -lQtNetwork -lQtCore -L/usr/lib64/kde4/devel -lkdeui -lkdecore -lQtCore -lssl -lcrypto -lz -lbz2 -Wl,--export-dynamic -pthread -L/usr/local/lib64 -lstldb4 -lpthread -lferrisstreams -lferrisloki -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lsigc-2.0 -lsigc-2.0 -lsoprano -lQtCore -lsopranoclient -lpopt -lferris -lgpgme -lferrisxslt -Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore +Cflags: -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -pthread -I/usr/local/include/FerrisStreams -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/include/xalanc -pthread -I/usr/include/gnome-vfs-2.0 -I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gnome-vfs-module-2.0 -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -DQT_SHARED -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/kde4/ -DQT_SHARED -I/usr/include/QtCore -I/usr/include/Qt -pthread -I/usr/local/include/STLdb4 -I/usr/local/include -I/usr/local/include/FerrisLoki -I/usr/local/include/FerrisLoki/loki -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/FerrisStreams -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib64/sigc++-2.0/include -I/usr/local/include/Ferris -DQT_SHARED -I/usr/include/QtCore diff --git a/firsttime/Makefile.in b/firsttime/Makefile.in index 6ea9d5a..23cc1ba 100644 --- a/firsttime/Makefile.in +++ b/firsttime/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/firsttime/console/Makefile.in b/firsttime/console/Makefile.in index 6b90b88..b72f578 100644 --- a/firsttime/console/Makefile.in +++ b/firsttime/console/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/firsttime/console/ferris-first-time-user.cpp b/firsttime/console/ferris-first-time-user.cpp index a791944..b90c8cb 100644 --- a/firsttime/console/ferris-first-time-user.cpp +++ b/firsttime/console/ferris-first-time-user.cpp @@ -338,6 +338,10 @@ int main( int argc, char** argv ) { if( Verbose ) cout << "Setting up ~/.ferris from skel files..." << endl; + + // Do it this way to avoid Runner trying to use logging and causing + // a catch-22 + g_spawn_command_line_sync( "ferris-setup-from-skels.sh", 0, 0, 0, 0 ); { fh_runner r = new Runner(); diff --git a/firsttime/ui/Makefile.in b/firsttime/ui/Makefile.in index dfe5c3b..2372528 100644 --- a/firsttime/ui/Makefile.in +++ b/firsttime/ui/Makefile.in @@ -119,6 +119,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -127,6 +129,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -182,6 +186,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -416,6 +421,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -488,6 +494,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -499,6 +506,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -578,6 +586,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/fulltextindexers_custom_plugin/Makefile.in b/fulltextindexers_custom_plugin/Makefile.in index a1ae7a6..c5278a1 100644 --- a/fulltextindexers_custom_plugin/Makefile.in +++ b/fulltextindexers_custom_plugin/Makefile.in @@ -145,6 +145,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -153,6 +155,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -208,6 +212,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -442,6 +447,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -514,6 +520,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -525,6 +532,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -604,6 +612,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/ltmain.sh b/ltmain.sh index aa5624c..78cf017 100755 --- a/ltmain.sh +++ b/ltmain.sh @@ -8050,7 +8050,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done diff --git a/macros/ferrismacros.m4 b/macros/ferrismacros.m4 index b4fec03..205d1b7 100644 --- a/macros/ferrismacros.m4 +++ b/macros/ferrismacros.m4 @@ -24,7 +24,7 @@ dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK) dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount) dnl dnl @author Angus Lees -dnl @version $Id: ferrismacros.m4,v 1.32 2011/06/17 21:30:22 ben Exp $ +dnl @version $Id: ferrismacros.m4,v 1.36 2011/06/17 21:38:48 ben Exp $ AC_DEFUN(AC_PATH_GENERIC, [dnl @@ -277,7 +277,7 @@ AC_ARG_WITH(stlport, [ --with-stlport=DIR use stlport 4.5+ install rooted at ], [STLPORT_CFLAGS=" -I$withval/stlport " STLPORT_LDFLAGS=" -L$withval/lib " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L$withval/lib ${STLPORT_LIB} " stlport_try_trivial_compile=yes ]) @@ -331,7 +331,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/local/STLport-4.5/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L/usr/local/STLport-4.5/lib ${STLPORT_LIB} " AM_FERRIS_STLPORT_INTERNAL_TRYLINK( [have_stlport=yes], [have_stlport=no] ) @@ -339,7 +339,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/local/include/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" -L/usr/local/lib ${STLPORT_LIB} " AM_FERRIS_STLPORT_INTERNAL_TRYLINK( [have_stlport=yes], [have_stlport=no] ) @@ -347,7 +347,7 @@ fi if test x"$have_stlport" = xno; then STLPORT_CFLAGS=" -I/usr/include/stlport " - STLPORT_LIB=" -lstlport_gcc -lpthread " + STLPORT_LIB=" -lstlport -lpthread " STLPORT_LIBS=" ${STLPORT_LIB} " AM_FERRIS_STLPORT_INTERNAL_TRYLINK( [have_stlport=yes], [have_stlport=no] ) @@ -2248,8 +2248,8 @@ if test x"$attempt_to_find_kde" = xno; then else if test x"$have_tested_for_kde" = x; then AC_LANG_CPLUSPLUS - AC_ARG_WITH(qt, [ --with-qt build with Qt utils. [autodetected]],,with_qt=yes) - if test x$with_qt = xyes ; then +dnl AC_ARG_WITH(qt, [ --with-qt build with Qt utils. [autodetected]],,with_qt=yes) +dnl if test x$with_qt = xyes ; then PKG_CHECK_MODULES(QTCORE, QtCore >= 4.4.3, [ have_qtcore=yes ], [ have_qtcore=no ] ) @@ -2261,7 +2261,7 @@ else echo "QT_CFLAGS: $QT_CFLAGS" echo "QT_LIBS: $QT_LIBS" - KDE_INCLUDEDIR="`kde4-config --prefix`/include/kde4 " + KDE_INCLUDEDIR="`kde4-config --path include` " KDE_LIBDIR="`kde4-config --prefix`/lib`kde4-config --libsuffix`/kde4/devel" AC_ARG_WITH(kde-includedir, [ --with-kde-includedir=DIR root directory containing KDE include files], @@ -2346,7 +2346,7 @@ else AC_SUBST(QT_LIBS) AC_SUBST(QT_CXXFLAGS) AC_SUBST(QT_LDADD) - fi +dnl fi fi have_tested_for_kde=yes @@ -2515,7 +2515,7 @@ else if test x"$have_tested_for_plasma" = x; then AC_LANG_CPLUSPLUS - PLASMA_INCLUDEDIR=" -I`kde4-config --prefix`/include/kde4/plasma -I`kde4-config --prefix`/include/kde4/KDE " + PLASMA_INCLUDEDIR=" -I`kde4-config --prefix`/include/kde4/plasma -I`kde4-config --prefix`/include/kde4/KDE -I`kde4-config --prefix`/include/KDE " PLASMA_LIBDIR="`kde4-config --prefix`/lib`plasma4-config --libsuffix` " AC_ARG_WITH(plasma-includedir, [ --with-plasma-includedir=DIR root directory containing PLASMA include files], diff --git a/media/Makefile.in b/media/Makefile.in index beb5b48..82bec13 100644 --- a/media/Makefile.in +++ b/media/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/media/icons/Makefile.in b/media/icons/Makefile.in index 416e88b..a8a3edb 100644 --- a/media/icons/Makefile.in +++ b/media/icons/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/media/xslt/Makefile.in b/media/xslt/Makefile.in index 40684d5..e626afc 100644 --- a/media/xslt/Makefile.in +++ b/media/xslt/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/mg/Makefile.in b/mg/Makefile.in index bcfe5ce..4da71d5 100644 --- a/mg/Makefile.in +++ b/mg/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/migration/Makefile.in b/migration/Makefile.in index 3cab015..d152c77 100644 --- a/migration/Makefile.in +++ b/migration/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/noarch/Makefile.in b/noarch/Makefile.in index b14a83c..44bb743 100644 --- a/noarch/Makefile.in +++ b/noarch/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/patches/Makefile.in b/patches/Makefile.in index 7b34338..d5d7099 100644 --- a/patches/Makefile.in +++ b/patches/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/perl/Makefile.in b/perl/Makefile.in index 9f5f29f..d24535b 100644 --- a/perl/Makefile.in +++ b/perl/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 27f978a..4aedd99 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/Makefile.in b/plugins/astext/Makefile.in index b39e985..572b9cc 100644 --- a/plugins/astext/Makefile.in +++ b/plugins/astext/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/djvu/Makefile.in b/plugins/astext/djvu/Makefile.in index 2581a33..3953a28 100644 --- a/plugins/astext/djvu/Makefile.in +++ b/plugins/astext/djvu/Makefile.in @@ -140,6 +140,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -148,6 +150,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -203,6 +207,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -437,6 +442,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -509,6 +515,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -520,6 +527,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -599,6 +607,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/extern/Makefile.in b/plugins/astext/extern/Makefile.in index 29c8645..d1e1047 100644 --- a/plugins/astext/extern/Makefile.in +++ b/plugins/astext/extern/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/html/Makefile.in b/plugins/astext/html/Makefile.in index eb8a1a9..8898ede 100644 --- a/plugins/astext/html/Makefile.in +++ b/plugins/astext/html/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/man/Makefile.in b/plugins/astext/man/Makefile.in index f6a19cf..a9e653b 100644 --- a/plugins/astext/man/Makefile.in +++ b/plugins/astext/man/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/msdoc/Makefile.in b/plugins/astext/msdoc/Makefile.in index 44cb3b2..6ca4dd7 100644 --- a/plugins/astext/msdoc/Makefile.in +++ b/plugins/astext/msdoc/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/astext/pdf/Makefile.in b/plugins/astext/pdf/Makefile.in index 56d463a..4628629 100644 --- a/plugins/astext/pdf/Makefile.in +++ b/plugins/astext/pdf/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/Makefile.am b/plugins/context/Makefile.am index 2350f8b..9548033 100644 --- a/plugins/context/Makefile.am +++ b/plugins/context/Makefile.am @@ -119,7 +119,7 @@ SUBDIRS = \ $(DBUSDIR) $(HALDIR) $(QTSQLDIR) recordfile \ google webphotos facebook vimeo \ $(GSTREAMERDIR) $(UPNPDIR) $(QTFTPDIR) $(QTHTTPDIR) \ - $(SANEDIR) $(QPRINTERDIR) $(PLASMADIR) $(PULSEDIR) wiki pastebin identica + $(SANEDIR) $(QPRINTERDIR) $(PLASMADIR) $(PULSEDIR) wiki pastebin identica zoneminder ferrisrest # $(PCCTSDIR) diff --git a/plugins/context/Makefile.in b/plugins/context/Makefile.in index 83c7a71..cb7d2d3 100644 --- a/plugins/context/Makefile.in +++ b/plugins/context/Makefile.in @@ -66,7 +66,7 @@ DIST_SUBDIRS = commondbapi commonsqldbapi libmpeg3 xml edb spirit \ xwin annodex emacs firefox obby xsltfs xmms amarok dbus hal \ qtsql recordfile google webphotos facebook vimeo gstreamer \ upnp qtftp qthttp sane printer plasma pulseaudio wiki pastebin \ - identica + identica zoneminder ferrisrest DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -137,6 +137,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -145,6 +147,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -200,6 +204,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -434,6 +439,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -506,6 +512,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -517,6 +524,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -596,6 +604,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -715,7 +724,7 @@ SUBDIRS = \ $(DBUSDIR) $(HALDIR) $(QTSQLDIR) recordfile \ google webphotos facebook vimeo \ $(GSTREAMERDIR) $(UPNPDIR) $(QTFTPDIR) $(QTHTTPDIR) \ - $(SANEDIR) $(QPRINTERDIR) $(PLASMADIR) $(PULSEDIR) wiki pastebin identica + $(SANEDIR) $(QPRINTERDIR) $(PLASMADIR) $(PULSEDIR) wiki pastebin identica zoneminder ferrisrest all: all-recursive diff --git a/plugins/context/amarok/Makefile.am b/plugins/context/amarok/Makefile.am index a44eb71..8a1d3dd 100644 --- a/plugins/context/amarok/Makefile.am +++ b/plugins/context/amarok/Makefile.am @@ -7,11 +7,11 @@ BUILT_SOURCES = player_interface.cpp player_interface.h tracklist_interface.cpp player_interface.cpp player_interface.h: player_interface.xml qdbusxml2cpp -N -m -i dbus-extra-types.hh -c player -p player_interface $(srcdir)/player_interface.xml - moc-qt4 player_interface.h -o player_interface.moc + $(MOC) player_interface.h -o player_interface.moc tracklist_interface.cpp tracklist_interface.h: tracklist_interface.xml qdbusxml2cpp -N -m -c tracklist -p tracklist_interface $(srcdir)/tracklist_interface.xml - moc-qt4 tracklist_interface.h -o tracklist_interface.moc + $(MOC) tracklist_interface.h -o tracklist_interface.moc diff --git a/plugins/context/amarok/Makefile.in b/plugins/context/amarok/Makefile.in index b2f1c58..faa7d2e 100644 --- a/plugins/context/amarok/Makefile.in +++ b/plugins/context/amarok/Makefile.in @@ -168,6 +168,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -176,6 +178,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -231,6 +235,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -465,6 +470,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -537,6 +543,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -548,6 +555,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -627,6 +635,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1051,11 +1060,11 @@ uninstall-am: uninstall-pluginLTLIBRARIES @FERRIS_HAVE_AMAROK_TRUE@player_interface.cpp player_interface.h: player_interface.xml @FERRIS_HAVE_AMAROK_TRUE@ qdbusxml2cpp -N -m -i dbus-extra-types.hh -c player -p player_interface $(srcdir)/player_interface.xml -@FERRIS_HAVE_AMAROK_TRUE@ moc-qt4 player_interface.h -o player_interface.moc +@FERRIS_HAVE_AMAROK_TRUE@ $(MOC) player_interface.h -o player_interface.moc @FERRIS_HAVE_AMAROK_TRUE@tracklist_interface.cpp tracklist_interface.h: tracklist_interface.xml @FERRIS_HAVE_AMAROK_TRUE@ qdbusxml2cpp -N -m -c tracklist -p tracklist_interface $(srcdir)/tracklist_interface.xml -@FERRIS_HAVE_AMAROK_TRUE@ moc-qt4 tracklist_interface.h -o tracklist_interface.moc +@FERRIS_HAVE_AMAROK_TRUE@ $(MOC) tracklist_interface.h -o tracklist_interface.moc # 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 --git a/plugins/context/annodex/Makefile.in b/plugins/context/annodex/Makefile.in index eddd98a..0447fdc 100644 --- a/plugins/context/annodex/Makefile.in +++ b/plugins/context/annodex/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/bibtex/Makefile.in b/plugins/context/bibtex/Makefile.in index f9e1f25..8982d82 100644 --- a/plugins/context/bibtex/Makefile.in +++ b/plugins/context/bibtex/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/commondbapi/Makefile.in b/plugins/context/commondbapi/Makefile.in index 3a4473f..7d55bff 100644 --- a/plugins/context/commondbapi/Makefile.in +++ b/plugins/context/commondbapi/Makefile.in @@ -120,6 +120,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -128,6 +130,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -183,6 +187,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -417,6 +422,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -489,6 +495,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -500,6 +507,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -579,6 +587,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/commonsqldbapi/Makefile.in b/plugins/context/commonsqldbapi/Makefile.in index 4ce946c..b4d38cf 100644 --- a/plugins/context/commonsqldbapi/Makefile.in +++ b/plugins/context/commonsqldbapi/Makefile.in @@ -120,6 +120,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -128,6 +130,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -183,6 +187,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -417,6 +422,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -489,6 +495,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -500,6 +507,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -579,6 +587,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/db4/Makefile.in b/plugins/context/db4/Makefile.in index ae87631..7363c7f 100644 --- a/plugins/context/db4/Makefile.in +++ b/plugins/context/db4/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/dbus/Makefile.in b/plugins/context/dbus/Makefile.in index 28e11d5..51ae764 100644 --- a/plugins/context/dbus/Makefile.in +++ b/plugins/context/dbus/Makefile.in @@ -154,6 +154,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -162,6 +164,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -217,6 +221,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -451,6 +456,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -523,6 +529,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -534,6 +541,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -613,6 +621,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/dbxml/Makefile.in b/plugins/context/dbxml/Makefile.in index 71479fb..425fe24 100644 --- a/plugins/context/dbxml/Makefile.in +++ b/plugins/context/dbxml/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/dtl/Makefile.in b/plugins/context/dtl/Makefile.in index e2b1968..13c3085 100644 --- a/plugins/context/dtl/Makefile.in +++ b/plugins/context/dtl/Makefile.in @@ -160,6 +160,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -168,6 +170,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -223,6 +227,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -457,6 +462,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -529,6 +535,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -540,6 +547,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -619,6 +627,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/dvdread/Makefile.in b/plugins/context/dvdread/Makefile.in index 3a02351..7ea89b3 100644 --- a/plugins/context/dvdread/Makefile.in +++ b/plugins/context/dvdread/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/edb/Makefile.in b/plugins/context/edb/Makefile.in index b621e00..7861308 100644 --- a/plugins/context/edb/Makefile.in +++ b/plugins/context/edb/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/eet/Makefile.in b/plugins/context/eet/Makefile.in index ace78f4..d7738b8 100644 --- a/plugins/context/eet/Makefile.in +++ b/plugins/context/eet/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/emacs/Makefile.in b/plugins/context/emacs/Makefile.in index 9a2fcf4..fabedfc 100644 --- a/plugins/context/emacs/Makefile.in +++ b/plugins/context/emacs/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/evolution/Makefile.in b/plugins/context/evolution/Makefile.in index 9ad0cbe..d6bc130 100644 --- a/plugins/context/evolution/Makefile.in +++ b/plugins/context/evolution/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/external/Makefile.in b/plugins/context/external/Makefile.in index 9df74cf..f382dce 100644 --- a/plugins/context/external/Makefile.in +++ b/plugins/context/external/Makefile.in @@ -198,6 +198,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -206,6 +208,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -261,6 +265,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -495,6 +500,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -567,6 +573,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -578,6 +585,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -657,6 +665,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/external/extfs_modules/Makefile.in b/plugins/context/external/extfs_modules/Makefile.in index 6bbc8f5..18cfdca 100644 --- a/plugins/context/external/extfs_modules/Makefile.in +++ b/plugins/context/external/extfs_modules/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/facebook/Makefile.am b/plugins/context/facebook/Makefile.am index 7420fa0..d695da4 100644 --- a/plugins/context/facebook/Makefile.am +++ b/plugins/context/facebook/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisfacebook_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/facebook/Makefile.in b/plugins/context/facebook/Makefile.in index b8d5c44..368acb4 100644 --- a/plugins/context/facebook/Makefile.in +++ b/plugins/context/facebook/Makefile.in @@ -176,6 +176,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -184,6 +186,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -239,6 +243,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -473,6 +478,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -545,6 +551,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -556,6 +563,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -635,6 +643,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1083,7 +1092,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/ferrisrest/Makefile.am b/plugins/context/ferrisrest/Makefile.am new file mode 100644 index 0000000..077299a --- /dev/null +++ b/plugins/context/ferrisrest/Makefile.am @@ -0,0 +1,36 @@ +MOC_DEP_SRCS=libferrisferrisrest_shared_moc.cpp + +%_moc.cpp: %.hh + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ +BUILT_SOURCES = $(MOC_DEP_SRCS) +CLEANFILES = $(MOC_DEP_SRCS) + +plugindir = $(libdir)/ferris/plugins/context + +INCLUDES = \ + @STLPORT_CFLAGS@ \ + -I$(srcdir)/.. \ + -I$(top_srcdir)/src \ + -I$(includedir) \ + -I/usr/local/lib \ + @QT_CFLAGS@ \ + @QTNETWORK_CFLAGS@ \ + @QTDBUS_CFLAGS@ \ + @QJSON_CFLAGS@ \ + @CFLAGS@ + +plugin_LTLIBRARIES = libferrisferrisrest.la libferrisferrisrest_factory.la +libferrisferrisrest_factory_la_SOURCES = libferrisferrisrest_factory.cpp +libferrisferrisrest_factory_la_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +libferrisferrisrest_factory_la_LDFLAGS = @LIBFERRIS_PLUGIN_LT_LINE@ + + +libferrisferrisrest_la_SOURCES = libferrisferrisrest.cpp libferrisferrisrest_shared.hh +libferrisferrisrest_la_LDFLAGS = @CTXFERRISREST_LA@ @QT_LIBS@ @LIBFERRIS_PLUGIN_LT_LINE@ @QJSON_LIBS@ + + +noinst_LTLIBRARIES = libferrisferrisrest_shared.la +nodist_libferrisferrisrest_shared_la_SOURCES = $(MOC_DEP_SRCS) +libferrisferrisrest_shared_la_SOURCES = \ + libferrisferrisrest_shared.cpp libferrisferrisrest_shared.hh + diff --git a/plugins/context/ferrisrest/Makefile.in b/plugins/context/ferrisrest/Makefile.in new file mode 100644 index 0000000..04b68bc --- /dev/null +++ b/plugins/context/ferrisrest/Makefile.in @@ -0,0 +1,1075 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins/context/ferrisrest +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/ferrismacros.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(plugindir)" +LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) +libferrisferrisrest_la_LIBADD = +am_libferrisferrisrest_la_OBJECTS = libferrisferrisrest.lo +libferrisferrisrest_la_OBJECTS = $(am_libferrisferrisrest_la_OBJECTS) +libferrisferrisrest_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libferrisferrisrest_la_LDFLAGS) $(LDFLAGS) -o $@ +libferrisferrisrest_factory_la_DEPENDENCIES = +am_libferrisferrisrest_factory_la_OBJECTS = \ + libferrisferrisrest_factory.lo +libferrisferrisrest_factory_la_OBJECTS = \ + $(am_libferrisferrisrest_factory_la_OBJECTS) +libferrisferrisrest_factory_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libferrisferrisrest_factory_la_LDFLAGS) $(LDFLAGS) -o $@ +libferrisferrisrest_shared_la_LIBADD = +am_libferrisferrisrest_shared_la_OBJECTS = \ + libferrisferrisrest_shared.lo +am__objects_1 = libferrisferrisrest_shared_moc.lo +nodist_libferrisferrisrest_shared_la_OBJECTS = $(am__objects_1) +libferrisferrisrest_shared_la_OBJECTS = \ + $(am_libferrisferrisrest_shared_la_OBJECTS) \ + $(nodist_libferrisferrisrest_shared_la_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libferrisferrisrest_la_SOURCES) \ + $(libferrisferrisrest_factory_la_SOURCES) \ + $(libferrisferrisrest_shared_la_SOURCES) \ + $(nodist_libferrisferrisrest_shared_la_SOURCES) +DIST_SOURCES = $(libferrisferrisrest_la_SOURCES) \ + $(libferrisferrisrest_factory_la_SOURCES) \ + $(libferrisferrisrest_shared_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +ANNODEX_CFLAGS = @ANNODEX_CFLAGS@ +ANNODEX_LIBS = @ANNODEX_LIBS@ +ANTLR = @ANTLR@ +ANTLR_H = @ANTLR_H@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BEAGLE_CFLAGS = @BEAGLE_CFLAGS@ +BEAGLE_LIBS = @BEAGLE_LIBS@ +BONOBO_CFLAGS = @BONOBO_CFLAGS@ +BONOBO_LIBS = @BONOBO_LIBS@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ +BZIP2_CFLAGS = @BZIP2_CFLAGS@ +BZIP2_LIBS = @BZIP2_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CGICC_CFLAGS = @CGICC_CFLAGS@ +CGICC_LIBS = @CGICC_LIBS@ +CLIENTUI_APP_CFLAGS = @CLIENTUI_APP_CFLAGS@ +CLIENTUI_APP_LIBS = @CLIENTUI_APP_LIBS@ +CLIENTXSLT_APP_CFLAGS = @CLIENTXSLT_APP_CFLAGS@ +CLIENTXSLT_APP_LIBS = @CLIENTXSLT_APP_LIBS@ +CLIENT_APP_CFLAGS = @CLIENT_APP_CFLAGS@ +CLIENT_APP_LIBS = @CLIENT_APP_LIBS@ +CLUCENE_CFLAGS = @CLUCENE_CFLAGS@ +CLUCENE_LIBS = @CLUCENE_LIBS@ +CMML_CFLAGS = @CMML_CFLAGS@ +CMML_LIBS = @CMML_LIBS@ +COMMONDBDIR = @COMMONDBDIR@ +COMMONDB_LA = @COMMONDB_LA@ +COMMONSQLDBDIR = @COMMONSQLDBDIR@ +COMMONSQLDBDIR_LA = @COMMONSQLDBDIR_LA@ +COMPILE_SYMBOLS_AS_PUBLIC = @COMPILE_SYMBOLS_AS_PUBLIC@ +CONTEXT_PLUGIN_CFLAGS = @CONTEXT_PLUGIN_CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ +CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ +CTXGOOGLEDIR = @CTXGOOGLEDIR@ +CTXGOOGLE_LA = @CTXGOOGLE_LA@ +CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ +CTXGSTREAMER_LA = @CTXGSTREAMER_LA@ +CTXIDENTICADIR = @CTXIDENTICADIR@ +CTXIDENTICA_LA = @CTXIDENTICA_LA@ +CTXVIMEODIR = @CTXVIMEODIR@ +CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ +CURL_CFLAGS = @CURL_CFLAGS@ +CURL_LIBS = @CURL_LIBS@ +CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXCPPFLAGS = @CXXCPPFLAGS@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DB4_CFLAGS = @DB4_CFLAGS@ +DB4_LIBS = @DB4_LIBS@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBXML_CFLAGS = @DBXML_CFLAGS@ +DBXML_LIBS = @DBXML_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DESKTOP_FILE_DIR = @DESKTOP_FILE_DIR@ +DLG = @DLG@ +DLLTOOL = @DLLTOOL@ +DOTFILE_ETC = @DOTFILE_ETC@ +DSYMUTIL = @DSYMUTIL@ +DTLMODDIR = @DTLMODDIR@ +DTL_CFLAGS = @DTL_CFLAGS@ +DTL_LIBS = @DTL_LIBS@ +DUMPBIN = @DUMPBIN@ +DVDREAD_CFLAGS = @DVDREAD_CFLAGS@ +DVDREAD_LIBS = @DVDREAD_LIBS@ +EAIDXCUSTOMFERRISDB4TREE_LA = @EAIDXCUSTOMFERRISDB4TREE_LA@ +EAIDXCUSTOMFERRISDIR = @EAIDXCUSTOMFERRISDIR@ +EAIDXCUSTOMFERRIS_LA = @EAIDXCUSTOMFERRIS_LA@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +ECORE_CFLAGS = @ECORE_CFLAGS@ +ECORE_LIBS = @ECORE_LIBS@ +EDB_CFLAGS = @EDB_CFLAGS@ +EDB_LIBS = @EDB_LIBS@ +EET_CFLAGS = @EET_CFLAGS@ +EET_LIBS = @EET_LIBS@ +EFSD_CFLAGS = @EFSD_CFLAGS@ +EFSD_LIBS = @EFSD_LIBS@ +EGREP = @EGREP@ +EMACS_GNUCLIENT_PATH = @EMACS_GNUCLIENT_PATH@ +EMACS_MOUNT_CFLAGS = @EMACS_MOUNT_CFLAGS@ +EMACS_MOUNT_LIBS = @EMACS_MOUNT_LIBS@ +EPEG_CFLAGS = @EPEG_CFLAGS@ +EPEG_LIBS = @EPEG_LIBS@ +EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE = @EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE@ +EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@ +EVOLUTION_LIBS = @EVOLUTION_LIBS@ +EXEEXT = @EXEEXT@ +FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ +FAMPP2_LIBS = @FAMPP2_LIBS@ +FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ +FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ +FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ +FERRIS_IOSIZE = @FERRIS_IOSIZE@ +FERRIS_IOSIZE_WARNING = @FERRIS_IOSIZE_WARNING@ +FERRIS_MODULE_COMPILE_LIST = @FERRIS_MODULE_COMPILE_LIST@ +FERRIS_SMARTPTR_ASSERT = @FERRIS_SMARTPTR_ASSERT@ +FERRIS_VERSION = @FERRIS_VERSION@ +FGREP = @FGREP@ +FIREFOX_MOUNT_CFLAGS = @FIREFOX_MOUNT_CFLAGS@ +FIREFOX_MOUNT_LIBS = @FIREFOX_MOUNT_LIBS@ +FLAC_CFLAGS = @FLAC_CFLAGS@ +FLAC_LIBS = @FLAC_LIBS@ +FSPOT_CFLAGS = @FSPOT_CFLAGS@ +FSPOT_LIBS = @FSPOT_LIBS@ +FSTREAM_CFLAGS = @FSTREAM_CFLAGS@ +FSTREAM_LIBS = @FSTREAM_LIBS@ +FTXIDXCUSTOMFERRISDIR = @FTXIDXCUSTOMFERRISDIR@ +FTXIDXCUSTOMFERRIS_LA = @FTXIDXCUSTOMFERRIS_LA@ +FTXIDXLUCENEANALYZERDIR = @FTXIDXLUCENEANALYZERDIR@ +FTXIDXLUCENEANALYZER_LA = @FTXIDXLUCENEANALYZER_LA@ +FXD_BINARY = @FXD_BINARY@ +FXD_BINARY_A52PIPE = @FXD_BINARY_A52PIPE@ +FXD_BINARY_NATIVE_EA = @FXD_BINARY_NATIVE_EA@ +FXD_BINARY_PGMPIPE = @FXD_BINARY_PGMPIPE@ +FXD_BINARY_RGBA32 = @FXD_BINARY_RGBA32@ +FXD_CIPHER_BITS = @FXD_CIPHER_BITS@ +FXD_CIPHER_NAME = @FXD_CIPHER_NAME@ +FXD_CIPHER_NAME_LIST = @FXD_CIPHER_NAME_LIST@ +FXD_CIPHER_VERSION = @FXD_CIPHER_VERSION@ +FXD_DIGEST = @FXD_DIGEST@ +FXD_DISTINGUISHED_PERSON = @FXD_DISTINGUISHED_PERSON@ +FXD_EANAMES = @FXD_EANAMES@ +FXD_ENUMERATED_STRING = @FXD_ENUMERATED_STRING@ +FXD_EXIF_COMPRESSION = @FXD_EXIF_COMPRESSION@ +FXD_EXIF_COPYRIGHT = @FXD_EXIF_COPYRIGHT@ +FXD_EXIF_DATETIME_STRING = @FXD_EXIF_DATETIME_STRING@ +FXD_EXIF_EXPOSURE_PROGRAM = @FXD_EXIF_EXPOSURE_PROGRAM@ +FXD_EXIF_FLASH = @FXD_EXIF_FLASH@ +FXD_EXIF_LIGHT_SOURCE = @FXD_EXIF_LIGHT_SOURCE@ +FXD_EXIF_METERING_MODE = @FXD_EXIF_METERING_MODE@ +FXD_EXIF_ORIENTATION = @FXD_EXIF_ORIENTATION@ +FXD_EXIF_SENSING_METHOD = @FXD_EXIF_SENSING_METHOD@ +FXD_EXIF_USER_COMMENT = @FXD_EXIF_USER_COMMENT@ +FXD_EXIF_VERSION = @FXD_EXIF_VERSION@ +FXD_EXIF_YCBCR_POSITIONING = @FXD_EXIF_YCBCR_POSITIONING@ +FXD_FFILTER = @FXD_FFILTER@ +FXD_FILESIZE = @FXD_FILESIZE@ +FXD_FSID_T = @FXD_FSID_T@ +FXD_FTX_RANK = @FXD_FTX_RANK@ +FXD_GID_T = @FXD_GID_T@ +FXD_GROUPNAME = @FXD_GROUPNAME@ +FXD_HEIGHT_PIXELS = @FXD_HEIGHT_PIXELS@ +FXD_INODE_T = @FXD_INODE_T@ +FXD_INT32 = @FXD_INT32@ +FXD_INT64 = @FXD_INT64@ +FXD_INTLIST = @FXD_INTLIST@ +FXD_IP4PORT = @FXD_IP4PORT@ +FXD_LATITUDE = @FXD_LATITUDE@ +FXD_LATLONG = @FXD_LATLONG@ +FXD_LONG = @FXD_LONG@ +FXD_LONGITUDE = @FXD_LONGITUDE@ +FXD_MACHINE_NAME = @FXD_MACHINE_NAME@ +FXD_MIMETYPE = @FXD_MIMETYPE@ +FXD_MODE_STRING_T = @FXD_MODE_STRING_T@ +FXD_MODE_T = @FXD_MODE_T@ +FXD_PID = @FXD_PID@ +FXD_PIXELCOUNT = @FXD_PIXELCOUNT@ +FXD_PRIMARY_KEY = @FXD_PRIMARY_KEY@ +FXD_PRIMARY_KEY_REAL = @FXD_PRIMARY_KEY_REAL@ +FXD_PRIMARY_KEY_VIRTUAL = @FXD_PRIMARY_KEY_VIRTUAL@ +FXD_STRINGLIST = @FXD_STRINGLIST@ +FXD_STR_IP4ADDR = @FXD_STR_IP4ADDR@ +FXD_UID_T = @FXD_UID_T@ +FXD_UINT32 = @FXD_UINT32@ +FXD_UINT64 = @FXD_UINT64@ +FXD_UNIT_NAME_LENGTH = @FXD_UNIT_NAME_LENGTH@ +FXD_UNIXEPOCH_STRING = @FXD_UNIXEPOCH_STRING@ +FXD_UNIXEPOCH_T = @FXD_UNIXEPOCH_T@ +FXD_URL = @FXD_URL@ +FXD_URLLIST = @FXD_URLLIST@ +FXD_URL_IMPLICIT_RESOLVE = @FXD_URL_IMPLICIT_RESOLVE@ +FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM = @FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM@ +FXD_USERNAME = @FXD_USERNAME@ +FXD_WIDTH_PIXELS = @FXD_WIDTH_PIXELS@ +FXD_XLIST = @FXD_XLIST@ +FXD_XMLDOCSTRING = @FXD_XMLDOCSTRING@ +GCJ = @GCJ@ +GCJDEPMODE = @GCJDEPMODE@ +GCJFLAGS = @GCJFLAGS@ +GCJLUCENE_CFLAGS = @GCJLUCENE_CFLAGS@ +GCJLUCENE_GCJFLAGS = @GCJLUCENE_GCJFLAGS@ +GCJLUCENE_LIBS = @GCJLUCENE_LIBS@ +GCJ_CFLAGS = @GCJ_CFLAGS@ +GCJ_LIBS = @GCJ_LIBS@ +GDBM_CFLAGS = @GDBM_CFLAGS@ +GDBM_LIBS = @GDBM_LIBS@ +GIMP_MP_FLAGS = @GIMP_MP_FLAGS@ +GIMP_MP_LIBS = @GIMP_MP_LIBS@ +GIMP_THREAD_FLAGS = @GIMP_THREAD_FLAGS@ +GIMP_THREAD_LIBS = @GIMP_THREAD_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@ +GPHOTO2_CONFIG = @GPHOTO2_CONFIG@ +GPHOTO2_LIBS = @GPHOTO2_LIBS@ +GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTKEXTRA2_CFLAGS = @GTKEXTRA2_CFLAGS@ +GTKEXTRA2_LIBS = @GTKEXTRA2_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +ID3_CFLAGS = @ID3_CFLAGS@ +ID3_LIBS = @ID3_LIBS@ +IMLIB_CFLAGS = @IMLIB_CFLAGS@ +IMLIB_LIBS = @IMLIB_LIBS@ +INCLUDEDIR = @INCLUDEDIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IOSIZE = @IOSIZE@ +IPC_CONTEXT_CFLAGS = @IPC_CONTEXT_CFLAGS@ +IPC_CONTEXT_LIBS = @IPC_CONTEXT_LIBS@ +KDE_CFLAGS = @KDE_CFLAGS@ +KDE_EAGENERATOR_CFLAGS = @KDE_EAGENERATOR_CFLAGS@ +KDE_EAGENERATOR_LIBS = @KDE_EAGENERATOR_LIBS@ +KDE_LIBS = @KDE_LIBS@ +KSANE_CFLAGS = @KSANE_CFLAGS@ +KSANE_LIBS = @KSANE_LIBS@ +LD = @LD@ +LDAPMODDIR = @LDAPMODDIR@ +LDAP_CFLAGS = @LDAP_CFLAGS@ +LDAP_LIBS = @LDAP_LIBS@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_APP = @LDFLAGS_APP@ +LIBA52_CFLAGS = @LIBA52_CFLAGS@ +LIBA52_LIBS = @LIBA52_LIBS@ +LIBAMAROK_CFLAGS = @LIBAMAROK_CFLAGS@ +LIBAMAROK_LIBS = @LIBAMAROK_LIBS@ +LIBASTEXT_PLUGIN_FACTORIES_LA = @LIBASTEXT_PLUGIN_FACTORIES_LA@ +LIBATTR_CFLAGS = @LIBATTR_CFLAGS@ +LIBATTR_LIBS = @LIBATTR_LIBS@ +LIBBTPARSE_CFLAGS = @LIBBTPARSE_CFLAGS@ +LIBBTPARSE_LIBS = @LIBBTPARSE_LIBS@ +LIBCAP_CFLAGS = @LIBCAP_CFLAGS@ +LIBCAP_LIBS = @LIBCAP_LIBS@ +LIBCREATION_PLUGIN_FACTORIES_LA = @LIBCREATION_PLUGIN_FACTORIES_LA@ +LIBDIR = @LIBDIR@ +LIBDJVULIBRE_CFLAGS = @LIBDJVULIBRE_CFLAGS@ +LIBDJVULIBRE_LIBS = @LIBDJVULIBRE_LIBS@ +LIBEAGEN_PLUGIN_FACTORIES_LA = @LIBEAGEN_PLUGIN_FACTORIES_LA@ +LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@ +LIBEXIF_LIBS = @LIBEXIF_LIBS@ +LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@ +LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@ +LIBFERRISINDEXING_LA = @LIBFERRISINDEXING_LA@ +LIBFERRISMG_LA = @LIBFERRISMG_LA@ +LIBFERRISQTGUI_LA = @LIBFERRISQTGUI_LA@ +LIBFERRISUI_LA = @LIBFERRISUI_LA@ +LIBFERRISXSLT_LA = @LIBFERRISXSLT_LA@ +LIBFERRIS_ASTEXTPLUGIN_LT_LINE = @LIBFERRIS_ASTEXTPLUGIN_LT_LINE@ +LIBFERRIS_BETA = @LIBFERRIS_BETA@ +LIBFERRIS_CREATIONPLUGIN_LT_LINE = @LIBFERRIS_CREATIONPLUGIN_LT_LINE@ +LIBFERRIS_EAPLUGIN_LT_LINE = @LIBFERRIS_EAPLUGIN_LT_LINE@ +LIBFERRIS_FULLV = @LIBFERRIS_FULLV@ +LIBFERRIS_LA = @LIBFERRIS_LA@ +LIBFERRIS_LT_AGE = @LIBFERRIS_LT_AGE@ +LIBFERRIS_LT_CURRENT = @LIBFERRIS_LT_CURRENT@ +LIBFERRIS_LT_REVISION = @LIBFERRIS_LT_REVISION@ +LIBFERRIS_MAJOR = @LIBFERRIS_MAJOR@ +LIBFERRIS_MINOR = @LIBFERRIS_MINOR@ +LIBFERRIS_PLUGIN_FACTORY_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD@ +LIBFERRIS_PLUGIN_LIBADD = @LIBFERRIS_PLUGIN_LIBADD@ +LIBFERRIS_PLUGIN_LT_LINE = @LIBFERRIS_PLUGIN_LT_LINE@ +LIBFILE_CFLAGS = @LIBFILE_CFLAGS@ +LIBFILE_LIBS = @LIBFILE_LIBS@ +LIBGISTMIQ_CFLAGS = @LIBGISTMIQ_CFLAGS@ +LIBGISTMIQ_LIBS = @LIBGISTMIQ_LIBS@ +LIBIMAGEMAGICKNAMESPACEGLUE_LA = @LIBIMAGEMAGICKNAMESPACEGLUE_LA@ +LIBJASPER_CFLAGS = @LIBJASPER_CFLAGS@ +LIBJASPER_LIBS = @LIBJASPER_LIBS@ +LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@ +LIBJPEG_LIBS = @LIBJPEG_LIBS@ +LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@ +LIBMAGIC_LIBS = @LIBMAGIC_LIBS@ +LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@ +LIBMPEG3_LIBS = @LIBMPEG3_LIBS@ +LIBMPG2_CFLAGS = @LIBMPG2_CFLAGS@ +LIBMPG2_LIBS = @LIBMPG2_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBPLATINUM_CFLAGS = @LIBPLATINUM_CFLAGS@ +LIBPLATINUM_LIBS = @LIBPLATINUM_LIBS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPQXX_CFLAGS = @LIBPQXX_CFLAGS@ +LIBPQXX_LIBS = @LIBPQXX_LIBS@ +LIBRPM_CFLAGS = @LIBRPM_CFLAGS@ +LIBRPM_LIBS = @LIBRPM_LIBS@ +LIBS = @LIBS@ +LIBSELINUX_CFLAGS = @LIBSELINUX_CFLAGS@ +LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ +LIBTEXTCAT_CFLAGS = @LIBTEXTCAT_CFLAGS@ +LIBTEXTCAT_LIBS = @LIBTEXTCAT_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXMMS_CFLAGS = @LIBXMMS_CFLAGS@ +LIBXMMS_LIBS = @LIBXMMS_LIBS@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOKI_CFLAGS = @LOKI_CFLAGS@ +LOKI_LIBS = @LOKI_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +LT_RELEASE = @LT_RELEASE@ +MAGICK_CFLAGS = @MAGICK_CFLAGS@ +MAGICK_LIBS = @MAGICK_LIBS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ +MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ +MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ +MKDIR_P = @MKDIR_P@ +MOC = @MOC@ +MP3_CFLAGS = @MP3_CFLAGS@ +MP3_LIBS = @MP3_LIBS@ +NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ +NEPOMUK_LIBS = @NEPOMUK_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBBYMODDIR = @OBBYMODDIR@ +OBBY_CFLAGS = @OBBY_CFLAGS@ +OBBY_LIBS = @OBBY_LIBS@ +OBBY_MOUNT_CFLAGS = @OBBY_MOUNT_CFLAGS@ +OBBY_MOUNT_LIBS = @OBBY_MOUNT_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OGGZ_CFLAGS = @OGGZ_CFLAGS@ +OGGZ_LIBS = @OGGZ_LIBS@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PASTEBINDIR = @PASTEBINDIR@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PCCTS_CFLAGS = @PCCTS_CFLAGS@ +PGCTXMODDIR = @PGCTXMODDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLASMA_CFLAGS = @PLASMA_CFLAGS@ +PLASMA_LIBS = @PLASMA_LIBS@ +PREFIX = @PREFIX@ +PREFIXSTR = @PREFIXSTR@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +QJSON_CFLAGS = @QJSON_CFLAGS@ +QJSON_LIBS = @QJSON_LIBS@ +QOAUTH_CFLAGS = @QOAUTH_CFLAGS@ +QOAUTH_LIBS = @QOAUTH_LIBS@ +QPRINTER_CFLAGS = @QPRINTER_CFLAGS@ +QPRINTER_LIBS = @QPRINTER_LIBS@ +QTCORE_CFLAGS = @QTCORE_CFLAGS@ +QTCORE_LIBS = @QTCORE_LIBS@ +QTDBUS_CFLAGS = @QTDBUS_CFLAGS@ +QTDBUS_LIBS = @QTDBUS_LIBS@ +QTGUI_CFLAGS = @QTGUI_CFLAGS@ +QTGUI_LIBS = @QTGUI_LIBS@ +QTNETWORK_CFLAGS = @QTNETWORK_CFLAGS@ +QTNETWORK_LIBS = @QTNETWORK_LIBS@ +QTSQLCTXMODDIR = @QTSQLCTXMODDIR@ +QTSQL_CFLAGS = @QTSQL_CFLAGS@ +QTSQL_LIBS = @QTSQL_LIBS@ +QT_CFLAGS = @QT_CFLAGS@ +QT_CXXFLAGS = @QT_CXXFLAGS@ +QT_LDADD = @QT_LDADD@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +REQUIREMENTS = @REQUIREMENTS@ +REQUIREMENTSUI = @REQUIREMENTSUI@ +REQUIREMENTSXSLT = @REQUIREMENTSXSLT@ +RPM_BUILD_ROOT = @RPM_BUILD_ROOT@ +SANE_CFLAGS = @SANE_CFLAGS@ +SANE_LIBS = @SANE_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ +SHAREDLDAP_LA = @SHAREDLDAP_LA@ +SHAREDOBBY_LA = @SHAREDOBBY_LA@ +SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ +SHAREDPGCTX_LA = @SHAREDPGCTX_LA@ +SHAREDQTSQLCTX_LA = @SHAREDQTSQLCTX_LA@ +SHAREDSOPRANOEA_LA = @SHAREDSOPRANOEA_LA@ +SHAREDSQLPLUS_LA = @SHAREDSQLPLUS_LA@ +SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ +SHAREDWIKI_LA = @SHAREDWIKI_LA@ +SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ +SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ +SHELL = @SHELL@ +SIGC_CFLAGS = @SIGC_CFLAGS@ +SIGC_LIBS = @SIGC_LIBS@ +SOCKETPP_CFLAGS = @SOCKETPP_CFLAGS@ +SOCKETPP_LIBS = @SOCKETPP_LIBS@ +SOPRANOEAMODDIR = @SOPRANOEAMODDIR@ +SOPRANO_CFLAGS = @SOPRANO_CFLAGS@ +SOPRANO_LIBS = @SOPRANO_LIBS@ +SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ +SQLITE3_LIBS = @SQLITE3_LIBS@ +SQLPLUSMODDIR = @SQLPLUSMODDIR@ +SQLPLUS_CFLAGS = @SQLPLUS_CFLAGS@ +SQLPLUS_LIBS = @SQLPLUS_LIBS@ +SSHCMD = @SSHCMD@ +STLDB4_CFLAGS = @STLDB4_CFLAGS@ +STLDB4_LIBS = @STLDB4_LIBS@ +STLPORT_CFLAGS = @STLPORT_CFLAGS@ +STLPORT_LDFLAGS = @STLPORT_LDFLAGS@ +STLPORT_LIB = @STLPORT_LIB@ +STLPORT_LIBS = @STLPORT_LIBS@ +STREAMS_CFLAGS = @STREAMS_CFLAGS@ +STREAMS_LIBS = @STREAMS_LIBS@ +STRIGI_CFLAGS = @STRIGI_CFLAGS@ +STRIGI_LIBS = @STRIGI_LIBS@ +STRIP = @STRIP@ +SVMLIGHT_CFLAGS = @SVMLIGHT_CFLAGS@ +SVMLIGHT_LIBS = @SVMLIGHT_LIBS@ +SWIG_OCAML_CFLAGS = @SWIG_OCAML_CFLAGS@ +SWIG_OCAML_HEADERDIR = @SWIG_OCAML_HEADERDIR@ +SWIG_PERL_CFLAGS = @SWIG_PERL_CFLAGS@ +SWIG_PERL_PMDIR = @SWIG_PERL_PMDIR@ +SWIG_PYTHON_CFLAGS = @SWIG_PYTHON_CFLAGS@ +SWIG_PYTHON_LIBDIR = @SWIG_PYTHON_LIBDIR@ +SWIG_PYTHON_MODULEDIR = @SWIG_PYTHON_MODULEDIR@ +SYSCONFDIR = @SYSCONFDIR@ +TAGLIB_CFLAGS = @TAGLIB_CFLAGS@ +TAGLIB_LIBS = @TAGLIB_LIBS@ +TDB_CFLAGS = @TDB_CFLAGS@ +TDB_LIBS = @TDB_LIBS@ +TSEARCH2_CFLAGS = @TSEARCH2_CFLAGS@ +TSEARCH2_LIBS = @TSEARCH2_LIBS@ +UUID_LIBS = @UUID_LIBS@ +VERSION = @VERSION@ +WAV_CFLAGS = @WAV_CFLAGS@ +WAV_LIBS = @WAV_LIBS@ +WEBPHOTOSDIR = @WEBPHOTOSDIR@ +WIKIDIR = @WIKIDIR@ +XALAN_CFLAGS = @XALAN_CFLAGS@ +XALAN_LIBS = @XALAN_LIBS@ +XAPIAN_CFLAGS = @XAPIAN_CFLAGS@ +XAPIAN_CONFIG = @XAPIAN_CONFIG@ +XAPIAN_LIBS = @XAPIAN_LIBS@ +XERCESC_CFLAGS = @XERCESC_CFLAGS@ +XERCESC_LIBS = @XERCESC_LIBS@ +XERCES_INTERNAL_HEADERS_CFLAGS = @XERCES_INTERNAL_HEADERS_CFLAGS@ +XFSPROGS_CFLAGS = @XFSPROGS_CFLAGS@ +XFSPROGS_LIBS = @XFSPROGS_LIBS@ +XINE_ACFLAGS = @XINE_ACFLAGS@ +XINE_CFLAGS = @XINE_CFLAGS@ +XINE_CONFIG = @XINE_CONFIG@ +XINE_EAGENERATOR_CFLAGS = @XINE_EAGENERATOR_CFLAGS@ +XINE_EAGENERATOR_LIBS = @XINE_EAGENERATOR_LIBS@ +XINE_LIBS = @XINE_LIBS@ +XML4C_CFLAGS = @XML4C_CFLAGS@ +XML4C_LIBS = @XML4C_LIBS@ +XMP_CFLAGS = @XMP_CFLAGS@ +XMP_LIBS = @XMP_LIBS@ +XQILLA_CFLAGS = @XQILLA_CFLAGS@ +XQILLA_LIBS = @XQILLA_LIBS@ +XSD_BASIC_BOOL = @XSD_BASIC_BOOL@ +XSD_BASIC_DOUBLE = @XSD_BASIC_DOUBLE@ +XSD_BASIC_FLOAT = @XSD_BASIC_FLOAT@ +XSD_BASIC_INT = @XSD_BASIC_INT@ +XSD_BASIC_INTEGER = @XSD_BASIC_INTEGER@ +XSD_BASIC_STRING = @XSD_BASIC_STRING@ +XSD_SCHEMA = @XSD_SCHEMA@ +XSD_UNKNOWN = @XSD_UNKNOWN@ +XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ +XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_GCJ = @ac_ct_GCJ@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_bogofilter = @have_bogofilter@ +have_bonobo = @have_bonobo@ +have_curl = @have_curl@ +have_dbus = @have_dbus@ +have_edb = @have_edb@ +have_eet = @have_eet@ +have_efsd = @have_efsd@ +have_epeg = @have_epeg@ +have_fsh = @have_fsh@ +have_hevea = @have_hevea@ +have_imlib2 = @have_imlib2@ +have_lynx = @have_lynx@ +have_magick = @have_magick@ +have_openssl = @have_openssl@ +have_ps2ascii = @have_ps2ascii@ +have_stlportcfg = @have_stlportcfg@ +have_swig_ocaml = @have_swig_ocaml@ +have_swig_perl = @have_swig_perl@ +have_swig_python = @have_swig_python@ +have_unrtf = @have_unrtf@ +have_wv = @have_wv@ +have_xmms = @have_xmms@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sqlite3_CFLAGS = @sqlite3_CFLAGS@ +sqlite3_LIBS = @sqlite3_LIBS@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MOC_DEP_SRCS = libferrisferrisrest_shared_moc.cpp +BUILT_SOURCES = $(MOC_DEP_SRCS) +CLEANFILES = $(MOC_DEP_SRCS) +plugindir = $(libdir)/ferris/plugins/context +INCLUDES = \ + @STLPORT_CFLAGS@ \ + -I$(srcdir)/.. \ + -I$(top_srcdir)/src \ + -I$(includedir) \ + -I/usr/local/lib \ + @QT_CFLAGS@ \ + @QTNETWORK_CFLAGS@ \ + @QTDBUS_CFLAGS@ \ + @QJSON_CFLAGS@ \ + @CFLAGS@ + +plugin_LTLIBRARIES = libferrisferrisrest.la libferrisferrisrest_factory.la +libferrisferrisrest_factory_la_SOURCES = libferrisferrisrest_factory.cpp +libferrisferrisrest_factory_la_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +libferrisferrisrest_factory_la_LDFLAGS = @LIBFERRIS_PLUGIN_LT_LINE@ +libferrisferrisrest_la_SOURCES = libferrisferrisrest.cpp libferrisferrisrest_shared.hh +libferrisferrisrest_la_LDFLAGS = @CTXFERRISREST_LA@ @QT_LIBS@ @LIBFERRIS_PLUGIN_LT_LINE@ @QJSON_LIBS@ +noinst_LTLIBRARIES = libferrisferrisrest_shared.la +nodist_libferrisferrisrest_shared_la_SOURCES = $(MOC_DEP_SRCS) +libferrisferrisrest_shared_la_SOURCES = \ + libferrisferrisrest_shared.cpp libferrisferrisrest_shared.hh + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/context/ferrisrest/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/context/ferrisrest/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -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 +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_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 +libferrisferrisrest.la: $(libferrisferrisrest_la_OBJECTS) $(libferrisferrisrest_la_DEPENDENCIES) + $(libferrisferrisrest_la_LINK) -rpath $(plugindir) $(libferrisferrisrest_la_OBJECTS) $(libferrisferrisrest_la_LIBADD) $(LIBS) +libferrisferrisrest_factory.la: $(libferrisferrisrest_factory_la_OBJECTS) $(libferrisferrisrest_factory_la_DEPENDENCIES) + $(libferrisferrisrest_factory_la_LINK) -rpath $(plugindir) $(libferrisferrisrest_factory_la_OBJECTS) $(libferrisferrisrest_factory_la_LIBADD) $(LIBS) +libferrisferrisrest_shared.la: $(libferrisferrisrest_shared_la_OBJECTS) $(libferrisferrisrest_shared_la_DEPENDENCIES) + $(CXXLINK) $(libferrisferrisrest_shared_la_OBJECTS) $(libferrisferrisrest_shared_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferrisferrisrest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferrisferrisrest_factory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferrisferrisrest_shared.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferrisferrisrest_shared_moc.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-pluginLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: all check install install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-pluginLTLIBRARIES \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + 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-pluginLTLIBRARIES + + +%_moc.cpp: %.hh + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ + +# 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. +.NOEXPORT: diff --git a/plugins/context/ferrisrest/libferrisferrisrest.cpp b/plugins/context/ferrisrest/libferrisferrisrest.cpp new file mode 100644 index 0000000..d3b331c --- /dev/null +++ b/plugins/context/ferrisrest/libferrisferrisrest.cpp @@ -0,0 +1,545 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2009 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresql.cpp,v 1.11 2009/04/18 21:30:09 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "libferrisferrisrest_shared.hh" +#include + +using namespace std; + +//#define DEBUG cerr +#define DEBUG LG_FERRISREST_D + +namespace Ferris +{ + extern "C" + { + FERRISEXP_EXPORT fh_context Brew( RootContextFactory* rf ) + throw( RootContextCreationFailed ); + }; + + using namespace Ferrisrest; + using XML::domnode_list_t; + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + template < class ParentCtx = FakeInternalContext > + class FERRISEXP_CTXPLUGIN FerrisrestContextBase + : + public ParentCtx + { + protected: + + bool m_haveTriedToRead; + time_t m_readTime; + + void priv_read(); + + // + // Short cut loading each dir unless absolutely needed. + // + fh_context priv_getSubContext( const string& rdn ) throw( NoSuchSubContext ); + + public: + FerrisrestContextBase( Context* parent, const std::string& rdn ) + : ParentCtx( parent, rdn ) + , m_haveTriedToRead( false ) + , m_readTime( 0 ) + { + } + virtual fh_ferrisrest getFerrisrest(); + virtual std::string getRemotePath(); + + private: + + }; + + + /******************************/ + /******************************/ + /******************************/ + + /******************************/ + /******************************/ + /******************************/ + + class FERRISEXP_CTXPLUGIN FerrisrestContext + : + public StateLessEAHolder< FerrisrestContext, FerrisrestContextBase<> > + { + typedef StateLessEAHolder< FerrisrestContext, FerrisrestContextBase<> > _Base; + typedef FerrisrestContext _Self; + + std::streamsize m_size; + + static fh_istream SL_getSize( FerrisrestContext* c, const std::string& rdn, EA_Atom* atom ) + { + fh_stringstream ss; + ss << c->m_size; + return ss; + } + + public: + + FerrisrestContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + , m_size( 0 ) + { + tryAddStateLessAttribute( "size", SL_getSize, FXD_FILESIZE ); + createStateLessAttributes(); + } + + fh_iostream getIsActive( Context* c, const std::string& rdn, EA_Atom* atom ) + { + fh_stringstream ss; + ss << ( getStrAttr( c, "state", "" ) == "OK" ); + return ss; + } + + std::string priv_getRecommendedEA() + { + static string rea = "name,id,active,function,width,height"; + return rea; + } + + void setup( const DOMElement* e ) + { + fh_ferrisrest zm = getFerrisrest(); + + std::list< DOMElement* > keyvals = XML::getAllChildrenElements( (DOMNode*)e, "keyval" ); + for( std::list< DOMElement* >::iterator kviter = keyvals.begin(); + kviter != keyvals.end(); ++kviter ) + { + string key = ::Ferris::getAttribute( (DOMElement*)*kviter, "key" ); + string val = XML::getChildText( (DOMElement*)*kviter ); + addAttribute( key, val ); + DEBUG << "adding k:" << key << " v:" << val << endl; + if( key == "size" ) + m_size = toType(val); + } + } + + + protected: + + ferris_ios::openmode + getSupportedOpenModes() + { + return + ios_base::in | + std::ios::in | + ios_base::out | + std::ios::out | + std::ios::trunc | + ios_base::binary ; + } + + fh_istream + priv_getIStream( ferris_ios::openmode m ) + throw (FerrisParentNotSetError, + CanNotGetStream, + std::exception) + { + fh_stringstream ret; + stringmap_t args; + args["path"] = getRemotePath(); + args["method"] = "read"; + args["zz"] = "top"; + fh_ferrisrest zm = getFerrisrest(); + QNetworkReply* reply = zm->post( args ); + ret << tostr(reply->readAll()); + return ret; + } + + virtual fh_iostream priv_getIOStream( ferris_ios::openmode m ) + throw (FerrisParentNotSetError, + AttributeNotWritable, + CanNotGetStream, + std::exception) + { + fh_stringstream ss; + ss->getCloseSig().connect( bind( sigc::mem_fun(*this, &_Self::priv_OnStreamClosed ), m )); + return ss; + } + + void priv_OnStreamClosed( fh_istream& ss, std::streamsize tellp, ferris_ios::openmode m ) + { + AdjustForOpenMode_Closing( ss, m, tellp ); + const string s = StreamToString(ss); + + stringmap_t args; + args["path"] = getRemotePath(); + args["method"] = "write"; + args["zz"] = "top"; + fh_ferrisrest zm = getFerrisrest(); + QNetworkReply* reply = zm->post( args, toba(s) ); + + fh_domdoc dom = zm->toDOM( reply ); + DOMElement* di = dom->getDocumentElement(); + if( di && tostr(di->getNodeName()) == "error" ) + { + string e = getStrSubCtx( di, "desc", "" ); + Throw_CanNotGetStream( e, 0 ); + } + } + + + private: + + }; + + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + class FERRISEXP_CTXPLUGIN FerrisrestServerContext + : + public FerrisrestContextBase< FakeInternalContext > + { + typedef FerrisrestContextBase< FakeInternalContext > _Base; + typedef FerrisrestServerContext _Self; + fh_ferrisrest m_zm; + userpass_t getUserPass( const std::string& server ); + + + + public: + + FerrisrestServerContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + , m_zm( Factory::getFerrisrest( rdn ) ) + { + DEBUG << "ctor, have read:" << getHaveReadDir() << endl; + getFerrisrest()->ensureAuthenticated(); + + } + + fh_ferrisrest getFerrisrest() + { + return m_zm; + } + virtual std::string getRemotePath() + { + return "/"; + } + + + +// void priv_read() +// { +// DEBUG << "priv_read() url:" << getURL() +// << " m_haveTriedToRead:" << m_haveTriedToRead +// << " have read:" << getHaveReadDir() +// << " subc.sz:" << getSubContextCount() +// << endl; + +// // if( getSubContextCount() ) +// time_t now = Time::getTime(); +// if( m_readTime && now - m_readTime < 60 ) +// { +// EnsureStartStopReadingIsFiredRAII _raii1( this ); +// emitExistsEventForEachItemRAII _raii2( this ); +// return; +// } + +// m_readTime = now; +// stringmap_t args; +// args["method"] = "ls"; +// args["path"] = "/"; +// args["eanames"] = "url,name,size,size-human-readable,mtime,atime,ctime,mtime-display,ctime-display,group-owner-number,group-owner-name,user-owner-number,user-owner-name,protection-raw,protection-ls"; +// args["format"] = "xml"; +// args["zz"] = "xx"; + +// fh_ferrisrest zm = getFerrisrest(); +// EnsureStartStopReadingIsFiredRAII _raii1( this ); +// QNetworkReply* reply = zm->post( args ); +// fh_domdoc dom = zm->toDOM( reply ); +// XML::DOMElementList_t del = XML::evalXPathToElements( dom, "/context/context" ); +// DEBUG << "children.sz:" << del.size() << endl; +// for( XML::DOMElementList_t::iterator di = del.begin(); di != del.end(); ++di ) +// { +// string rdn; + +// std::list< DOMElement* > keyvals = XML::getAllChildrenElements( (DOMNode*)*di, "keyval" ); +// for( std::list< DOMElement* >::iterator kviter = keyvals.begin(); +// kviter != keyvals.end(); ++kviter ) +// { +// string key = ::Ferris::getAttribute( (DOMElement*)*kviter, "key" ); +// string val = XML::getChildText( (DOMElement*)*kviter ); +// if( key == "name" ) +// rdn = val; +// } + +// DEBUG << "name:" << rdn << endl; +// FerrisrestContext* c = 0; +// c = priv_ensureSubContext( rdn, c ); +// c->setup( *di ); +// } +// } + }; + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + + class FERRISEXP_CTXPLUGIN FerrisrestRootContext + : + public networkRootContext< FerrisrestServerContext > + { + typedef networkRootContext< FerrisrestServerContext > _Base; + + public: + + FerrisrestRootContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + { + tryAugmentLocalhostNames(); + DEBUG << "ctor, have read:" << getHaveReadDir() << endl; + } + + }; + + + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + template < class ParentCtx > + void + FerrisrestContextBase< ParentCtx >::priv_read() + { + DEBUG << "priv_read() url:" << this->getURL() + << " m_haveTriedToRead:" << this->m_haveTriedToRead + << " have read:" << this->getHaveReadDir() + << " subc.sz:" << this->getSubContextCount() + << endl; + +// if( getSubContextCount() ) + time_t now = Time::getTime(); + if( this->m_readTime && now - this->m_readTime < 60 ) + { + Context::EnsureStartStopReadingIsFiredRAII _raii1( this ); + Context::emitExistsEventForEachItemRAII _raii2( this ); + return; + } + + this->m_readTime = now; + stringmap_t args; + args["method"] = "ls"; + args["path"] = getRemotePath(); + args["eanames"] = "url,name,size,size-human-readable,mtime,atime,ctime,mtime-display,ctime-display,group-owner-number,group-owner-name,user-owner-number,user-owner-name,protection-raw,protection-ls"; + args["format"] = "xml"; + args["zz"] = "xx"; + + fh_ferrisrest zm = getFerrisrest(); + Context::EnsureStartStopReadingIsFiredRAII _raii1( this ); + QNetworkReply* reply = zm->post( args ); + fh_domdoc dom = zm->toDOM( reply ); + XML::DOMElementList_t del = XML::evalXPathToElements( dom, "/context/context" ); + DEBUG << "children.sz:" << del.size() << endl; + for( XML::DOMElementList_t::iterator di = del.begin(); di != del.end(); ++di ) + { + string rdn; + + std::list< DOMElement* > keyvals = XML::getAllChildrenElements( (DOMNode*)*di, "keyval" ); + for( std::list< DOMElement* >::iterator kviter = keyvals.begin(); + kviter != keyvals.end(); ++kviter ) + { + string key = ::Ferris::getAttribute( (DOMElement*)*kviter, "key" ); + string val = XML::getChildText( (DOMElement*)*kviter ); + if( key == "name" ) + rdn = val; + } + + DEBUG << "name:" << rdn << endl; + FerrisrestContext* c = 0; + c = this->priv_ensureSubContext( rdn, c ); + c->setup( *di ); + } + } + + template < class ParentCtx > + fh_context + FerrisrestContextBase< ParentCtx >::priv_getSubContext( const string& rdn ) + throw( NoSuchSubContext ) + { + try + { + DEBUG << "priv_getSubContext() p:" << this->getDirPath() + << " rdn:" << rdn + << endl; + Context::Items_t::iterator isSubContextBoundCache; + if( this->priv_isSubContextBound( rdn, isSubContextBoundCache ) ) + { + DEBUG << "priv_getSubContext(bound already) p:" << this->getDirPath() + << " rdn:" << rdn + << endl; + return *isSubContextBoundCache; + } + + if( rdn.empty() ) + { + fh_stringstream ss; + ss << "NoSuchSubContext no rdn given"; + Throw_NoSuchSubContext( tostr(ss), this ); + } + else if( rdn[0] == '/' ) + { + fh_stringstream ss; + ss << "NoSuchSubContext no files start with unescaped '/' as filename"; + Throw_NoSuchSubContext( tostr(ss), this ); + } + + // ok + stringmap_t args; + args["method"] = "stat"; + args["path"] = getRemotePath() + "/" + rdn; + args["eanames"] = "url,name,size,size-human-readable,mtime,atime,ctime,mtime-display,ctime-display,group-owner-number,group-owner-name,user-owner-number,user-owner-name,protection-raw,protection-ls"; + args["format"] = "xml"; + args["zz"] = "top"; + + fh_ferrisrest zm = getFerrisrest(); + Context::EnsureStartStopReadingIsFiredRAII _raii1( this ); + QNetworkReply* reply = zm->post( args ); + fh_domdoc dom = zm->toDOM( reply ); + DOMElement* di = dom->getDocumentElement(); + if( di && tostr(di->getNodeName()) == "result" ) + { + FerrisrestContext* c = 0; + c = this->priv_ensureSubContext( rdn, c ); + c->setup( di ); + return c; + } + } + catch( NoSuchSubContext& e ) + { + throw e; + } + catch( exception& e ) + { + string s = e.what(); +// cerr << "NativeContext::priv_getSubContext() e:" << e.what() << endl; + Throw_NoSuchSubContext( s, this ); + } + catch(...) + {} + fh_stringstream ss; + ss << "NoSuchSubContext:" << rdn; + Throw_NoSuchSubContext( tostr(ss), this ); + } + + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + template < class ParentCtx > + fh_ferrisrest FerrisrestContextBase::getFerrisrest() + { + FerrisrestServerContext* p = 0; + p = ParentCtx::getFirstParentOfContextClass( p ); + return p->getFerrisrest(); + } + + template < class ParentCtx > + std::string FerrisrestContextBase::getRemotePath() + { + FerrisrestServerContext* p = 0; + p = ParentCtx::getFirstParentOfContextClass( p ); + + string fullearl = this->getURL(); + string parentearl = p->getURL(); + string ret = fullearl.substr( parentearl.length() ); + DEBUG << "fullearl :" << fullearl << endl + << " parentearl:" << parentearl << endl + << " ret:" << ret << endl; + return ret; + } + + + extern "C" + { + fh_context Brew( RootContextFactory* rf ) + throw( RootContextCreationFailed ) + { + try + { + DEBUG << "Brew()" << endl; + + static FerrisrestRootContext* c = 0; + if( !c ) + { + c = new FerrisrestRootContext(0, "/" ); + // Bump ref count. + static fh_context keeper = c; + static fh_context keeper2 = keeper; + DEBUG << "hi there" << endl; + } + fh_context ret = c; + + return ret; + } + catch( FerrisSqlServerNameNotFound& e ) + { + Throw_RootContextCreationFailed( e.what(), 0 ); + } + catch( exception& e ) + { + LG_PG_W << "e:" << e.what() << endl; + Throw_RootContextCreationFailed( e.what(), 0 ); + } + } + } + +}; diff --git a/plugins/context/ferrisrest/libferrisferrisrest_factory.cpp b/plugins/context/ferrisrest/libferrisferrisrest_factory.cpp new file mode 100644 index 0000000..924e9ef --- /dev/null +++ b/plugins/context/ferrisrest/libferrisferrisrest_factory.cpp @@ -0,0 +1,56 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresql_factory.cpp,v 1.1 2005/07/12 04:04:30 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include + +using namespace std; +namespace Ferris +{ + extern "C" + { + FERRISEXP_EXPORT fh_ommatchers GetOverMountMatchers(RootContextFactory* rf) + { + fh_ommatchers ret; + fh_matcher m = Factory::MakeAlwaysFalseMatcher(); + ret.push_back( m ); + return ret; + } + + FERRISEXP_EXPORT string getName() + { + return "rest"; + } + + FERRISEXP_EXPORT bool isTopLevel() + { + return true; + } + } + +}; diff --git a/plugins/context/ferrisrest/libferrisferrisrest_shared.cpp b/plugins/context/ferrisrest/libferrisferrisrest_shared.cpp new file mode 100644 index 0000000..c188222 --- /dev/null +++ b/plugins/context/ferrisrest/libferrisferrisrest_shared.cpp @@ -0,0 +1,288 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresqlshared.cpp,v 1.2 2006/12/07 06:49:42 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include "config.h" + +#include "libferrisferrisrest_shared.hh" +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#define DEBUG LG_FERRISREST_D +//#define DEBUG cerr + +using namespace std; + +namespace Ferris +{ + namespace Ferrisrest + { + static const string DBNAME = FDB_SECURE; + + FERRISEXP_EXPORT userpass_t getUserPass( + const std::string& server ) + { + string user; + string pass; + + string Key = server; + + { + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-username"; + user = getEDBString( DBNAME, tostr(ss), "" ); + } + + { + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-password"; + pass = getEDBString( DBNAME, tostr(ss), "" ); + } + + return make_pair( user, pass ); + } + + FERRISEXP_EXPORT void setUserPass( + const std::string& server, + const std::string& user, const std::string& pass ) + { + string Key = server; + + { + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-username"; + setEDBString( DBNAME, tostr(ss), user ); + } + + { + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-password"; + setEDBString( DBNAME, tostr(ss), pass ); + } + } + + std::string getBaseURI( const std::string& server ) + { + string Key = server; + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-baseurl"; + return getEDBString( DBNAME, tostr(ss), "" ); + } + + void setBaseURI( const std::string& server, const std::string& baseurl ) + { + string Key = server; + fh_stringstream ss; + ss << "ferrisrest--" << Key << "-baseurl"; + setEDBString( DBNAME, tostr(ss), baseurl ); + } + + + + //////////////////// + + using namespace XML; + using namespace std; + + const char* CFG_FERRISREST_USERNAME_K = "ferrisrest-username"; + const char* CFG_FERRISREST_USERNAME_DEF = ""; + + const char* CFG_FERRISREST_FULLNAME_K = "ferrisrest-fullname"; + const char* CFG_FERRISREST_FULLNAME_DEF = ""; + + const char* CFG_FERRISREST_AUTH_TOKEN_K = "ferrisrest-auth-token"; + const char* CFG_FERRISREST_AUTH_TOKEN_DEF = ""; + + const char* CFG_FERRISREST_UID_K = "ferrisrest-uid"; + const char* CFG_FERRISREST_UID_DEF = ""; + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + + QNetworkAccessManager* + Ferrisrest::getQManager() + { + return ::Ferris::getQManager(); + } + + Ferrisrest::Ferrisrest( const std::string& server ) + : m_serverURI( server ) + { + } + + Ferrisrest::~Ferrisrest() + { + } + + + bool + Ferrisrest::ensureAuthenticated() + { + if( isAuthenticated() ) + return true; + m_authenticated = true; + return m_authenticated; + } + + std::string + Ferrisrest::getBaseURI() const + { + return "http://" + m_serverURI + ::Ferris::Ferrisrest::getBaseURI( m_serverURI ); + } + + + fh_domdoc + Ferrisrest::toDOM( const QByteArray& ba ) + { + fh_stringstream ss; + ss << tostr(ba); + ss = trimXMLDeclaration( ss, true ); + fh_domdoc dom = Factory::StringToDOM( tostr(ss) ); + DOMElement* e = dom->getDocumentElement(); + return dom; + } + + fh_domdoc + Ferrisrest::toDOM( QNetworkReply* r ) + { + QByteArray ba = r->readAll(); + DEBUG << "todom, readAll() gave:" << tostr(ba) << endl; + return toDOM( ba ); + } + + + bool + Ferrisrest::isAuthenticated() const + { + return m_authenticated; + } + + + QNetworkRequest + Ferrisrest::sign( std::string earlTail, stringmap_t args ) + { + QNetworkRequest request; + request.setUrl( QUrl( ("http://" + m_serverURI + earlTail).c_str() ) ); + DEBUG << "sign(et 1) url:" << tostr(request.url().toString()) << endl; + request = sign( request, args ); + DEBUG << "sign(et 2) url:" << tostr(request.url().toString()) << endl; + DEBUG << "sign(et 2) auth:" << tostr(request.rawHeader("Authorization")) << endl; + return request; + } + + + QNetworkRequest + Ferrisrest::sign( QNetworkRequest request, stringmap_t args ) + { + DEBUG << "sign(1) url:" << tostr(request.url().toString()) << endl; + + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "sign.x:" << tostr(x) << endl; + DEBUG << "sign.args.sz:" << args.size() << endl; + url.setEncodedUrl( x.toUtf8() ); + url = addQueryItems( url, args ); + request.setUrl( url ); +// request.setRawHeader( "Authorization", header ); + DEBUG << "sign(2) url:" << tostr(request.url().toString()) << endl; + return request; + } + + QNetworkReply* + Ferrisrest::post( std::string earlTail, stringmap_t args, QByteArray content ) + { + QNetworkRequest request = sign( earlTail, args ); + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "post.x:" << tostr(x) << endl; + QNetworkReply* reply = post( request, content ); + return reply; + } + + + QNetworkReply* + Ferrisrest::post( stringmap_t args, QByteArray content ) + { + std::string earlTail = ::Ferris::Ferrisrest::getBaseURI( m_serverURI ); + QNetworkRequest request = sign( earlTail, args ); + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "post.x:" << tostr(x) << endl; + QNetworkReply* reply = post( request, content ); + return reply; + } + + + + QNetworkReply* + Ferrisrest::post( QNetworkRequest request, QByteArray content ) + { + QNetworkReply* reply = getQManager()->post( request, content ); + wait( reply ); + return reply; + } + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + }; + + namespace Factory + { + ::Ferris::Ferrisrest::fh_ferrisrest getFerrisrest( const std::string& server ) + { + ::Ferris::Ferrisrest::fh_ferrisrest ret( new ::Ferris::Ferrisrest::Ferrisrest( server ) ); + return ret; + } + + }; + + + + /****************************************/ + /****************************************/ + /****************************************/ + +}; diff --git a/plugins/context/ferrisrest/libferrisferrisrest_shared.hh b/plugins/context/ferrisrest/libferrisferrisrest_shared.hh new file mode 100644 index 0000000..3b8770e --- /dev/null +++ b/plugins/context/ferrisrest/libferrisferrisrest_shared.hh @@ -0,0 +1,115 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresqlshared.hh,v 1.2 2006/12/07 06:49:42 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#ifndef _ALREADY_INCLUDED_FERRIS_SHARED_FERRISREST_H_ +#define _ALREADY_INCLUDED_FERRIS_SHARED_FERRISREST_H_ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +namespace Ferris +{ + namespace Ferrisrest + { + FERRISEXP_EXPORT userpass_t getUserPass( const std::string& server ); + FERRISEXP_EXPORT void setUserPass( const std::string& server, + const std::string& user, const std::string& pass ); + FERRISEXP_EXPORT std::string getBaseURI( const std::string& server ); + FERRISEXP_EXPORT void setBaseURI( const std::string& server, const std::string& baseurl ); + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + + class Ferrisrest; + FERRIS_SMARTPTR( Ferrisrest, fh_ferrisrest ); + + class FERRISEXP_API Ferrisrest + : + public QObject, + public Handlable + { + Q_OBJECT; + + + std::string m_serverURI; //< Base to prepend to partial URL fragments + bool m_authenticated; + + + public: + + Ferrisrest( const std::string& server ); + virtual ~Ferrisrest(); + + QNetworkAccessManager* getQManager(); + + fh_domdoc toDOM( const QByteArray& ba ); + fh_domdoc toDOM( QNetworkReply* r ); + + bool isAuthenticated() const; + bool ensureAuthenticated(); + + std::string getBaseURI() const; + QNetworkRequest sign( std::string earlTail, stringmap_t args ); + QNetworkRequest sign( QNetworkRequest request, stringmap_t args ); + + + QNetworkReply* post( stringmap_t args, QByteArray content = QByteArray() ); + QNetworkReply* post( std::string earlTail, stringmap_t args, QByteArray content = QByteArray() ); + QNetworkReply* post( QNetworkRequest request, QByteArray content = QByteArray() ); + }; + + + /****************************************/ + /****************************************/ + /****************************************/ + }; + + /****************************************/ + /****************************************/ + /****************************************/ + + namespace Factory + { + Ferrisrest::fh_ferrisrest getFerrisrest( const std::string& server ); + }; +}; + +#endif diff --git a/plugins/context/firefox/Makefile.in b/plugins/context/firefox/Makefile.in index 7cbca5c..0f70c0f 100644 --- a/plugins/context/firefox/Makefile.in +++ b/plugins/context/firefox/Makefile.in @@ -192,6 +192,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -200,6 +202,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -255,6 +259,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -489,6 +494,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -561,6 +567,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -572,6 +579,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -651,6 +659,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/firefox/firefox-extension/Makefile.in b/plugins/context/firefox/firefox-extension/Makefile.in index bf2e8a8..1c4d291 100644 --- a/plugins/context/firefox/firefox-extension/Makefile.in +++ b/plugins/context/firefox/firefox-extension/Makefile.in @@ -91,6 +91,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -99,6 +101,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -154,6 +158,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -388,6 +393,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -460,6 +466,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -471,6 +478,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -550,6 +558,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/gdbm/Makefile.in b/plugins/context/gdbm/Makefile.in index 0972304..c1c4d73 100644 --- a/plugins/context/gdbm/Makefile.in +++ b/plugins/context/gdbm/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/google/Makefile.am b/plugins/context/google/Makefile.am index b17c06e..5b6aa97 100644 --- a/plugins/context/google/Makefile.am +++ b/plugins/context/google/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisgoogle_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/google/Makefile.in b/plugins/context/google/Makefile.in index 8aab16a..4574887 100644 --- a/plugins/context/google/Makefile.in +++ b/plugins/context/google/Makefile.in @@ -175,6 +175,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -183,6 +185,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -238,6 +242,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -472,6 +477,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -544,6 +550,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -555,6 +562,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -634,6 +642,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1086,7 +1095,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/gphoto2/Makefile.in b/plugins/context/gphoto2/Makefile.in index 31b0c15..e525570 100644 --- a/plugins/context/gphoto2/Makefile.in +++ b/plugins/context/gphoto2/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/gstreamer/Makefile.in b/plugins/context/gstreamer/Makefile.in index 14cb727..ef4cf23 100644 --- a/plugins/context/gstreamer/Makefile.in +++ b/plugins/context/gstreamer/Makefile.in @@ -174,6 +174,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -182,6 +184,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -237,6 +241,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -471,6 +476,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -543,6 +549,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -554,6 +561,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -633,6 +641,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/hal/Makefile.in b/plugins/context/hal/Makefile.in index 4b9429f..012d7b0 100644 --- a/plugins/context/hal/Makefile.in +++ b/plugins/context/hal/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/identica/Makefile.am b/plugins/context/identica/Makefile.am index 430a8af..e5dd5c1 100644 --- a/plugins/context/identica/Makefile.am +++ b/plugins/context/identica/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisidentica_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/identica/Makefile.in b/plugins/context/identica/Makefile.in index a1552c3..5e1a089 100644 --- a/plugins/context/identica/Makefile.in +++ b/plugins/context/identica/Makefile.in @@ -166,6 +166,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -174,6 +176,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -229,6 +233,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -463,6 +468,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -535,6 +541,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -546,6 +553,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -625,6 +633,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1058,7 +1067,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # noinst_PROGRAMS = identicatest # identicatest_SOURCES = identicatest.cpp libferrisidentica_shared.hh diff --git a/plugins/context/ipc/Makefile.in b/plugins/context/ipc/Makefile.in index 05f0db9..0d464a2 100644 --- a/plugins/context/ipc/Makefile.in +++ b/plugins/context/ipc/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/ldap/Makefile.in b/plugins/context/ldap/Makefile.in index 37a2587..badebd3 100644 --- a/plugins/context/ldap/Makefile.in +++ b/plugins/context/ldap/Makefile.in @@ -160,6 +160,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -168,6 +170,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -223,6 +227,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -457,6 +462,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -529,6 +535,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -540,6 +547,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -619,6 +627,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/libmpeg3/Makefile.in b/plugins/context/libmpeg3/Makefile.in index 5c04eaa..8c3169b 100644 --- a/plugins/context/libmpeg3/Makefile.in +++ b/plugins/context/libmpeg3/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/nativembox/Makefile.in b/plugins/context/nativembox/Makefile.in index cc10cf3..fb8463b 100644 --- a/plugins/context/nativembox/Makefile.in +++ b/plugins/context/nativembox/Makefile.in @@ -152,6 +152,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -160,6 +162,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -215,6 +219,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -449,6 +454,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -521,6 +527,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -532,6 +539,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -611,6 +619,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/obby/Makefile.in b/plugins/context/obby/Makefile.in index 02aaeab..eabfd8a 100644 --- a/plugins/context/obby/Makefile.in +++ b/plugins/context/obby/Makefile.in @@ -172,6 +172,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -180,6 +182,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -235,6 +239,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -469,6 +474,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -541,6 +547,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -552,6 +559,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -631,6 +639,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/pastebin/Makefile.am b/plugins/context/pastebin/Makefile.am index 4c48044..3f1b238 100644 --- a/plugins/context/pastebin/Makefile.am +++ b/plugins/context/pastebin/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrispastebinshared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/pastebin/Makefile.in b/plugins/context/pastebin/Makefile.in index 39b169c..de251b2 100644 --- a/plugins/context/pastebin/Makefile.in +++ b/plugins/context/pastebin/Makefile.in @@ -166,6 +166,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -174,6 +176,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -229,6 +233,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -463,6 +468,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -535,6 +541,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -546,6 +553,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -625,6 +633,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1055,7 +1064,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/plasma/Makefile.am b/plugins/context/plasma/Makefile.am index 9bd6dae..334d0da 100644 --- a/plugins/context/plasma/Makefile.am +++ b/plugins/context/plasma/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/plasma/Makefile.in b/plugins/context/plasma/Makefile.in index f911515..94f6ca1 100644 --- a/plugins/context/plasma/Makefile.in +++ b/plugins/context/plasma/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1013,7 +1022,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/postgresql/Makefile.in b/plugins/context/postgresql/Makefile.in index 6f0fef0..2466d54 100644 --- a/plugins/context/postgresql/Makefile.in +++ b/plugins/context/postgresql/Makefile.in @@ -174,6 +174,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -182,6 +184,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -237,6 +241,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -471,6 +476,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -543,6 +549,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -554,6 +561,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -633,6 +641,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/printer/Makefile.am b/plugins/context/printer/Makefile.am index 28abce6..49f7203 100644 --- a/plugins/context/printer/Makefile.am +++ b/plugins/context/printer/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/printer/Makefile.in b/plugins/context/printer/Makefile.in index abce4a9..2e60f01 100644 --- a/plugins/context/printer/Makefile.in +++ b/plugins/context/printer/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1013,7 +1022,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/pulseaudio/Makefile.in b/plugins/context/pulseaudio/Makefile.in index 00480a2..ce17c80 100644 --- a/plugins/context/pulseaudio/Makefile.in +++ b/plugins/context/pulseaudio/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/qtftp/Makefile.am b/plugins/context/qtftp/Makefile.am index 5238861..03aeb96 100644 --- a/plugins/context/qtftp/Makefile.am +++ b/plugins/context/qtftp/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisqtftp_moc_impl.cpp %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp BUILT_SOURCES = $(MOC_DEP_SRCS) diff --git a/plugins/context/qtftp/Makefile.in b/plugins/context/qtftp/Makefile.in index 67755c1..32cdd32 100644 --- a/plugins/context/qtftp/Makefile.in +++ b/plugins/context/qtftp/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1018,7 +1027,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp diff --git a/plugins/context/qthttp/Makefile.am b/plugins/context/qthttp/Makefile.am index bfcd872..29a5b51 100644 --- a/plugins/context/qthttp/Makefile.am +++ b/plugins/context/qthttp/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisqthttp_moc_impl.cpp %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp BUILT_SOURCES = $(MOC_DEP_SRCS) diff --git a/plugins/context/qthttp/Makefile.in b/plugins/context/qthttp/Makefile.in index 75cc169..990b28a 100644 --- a/plugins/context/qthttp/Makefile.in +++ b/plugins/context/qthttp/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1018,7 +1027,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp diff --git a/plugins/context/qtsql/Makefile.in b/plugins/context/qtsql/Makefile.in index 3b5ae8f..9832e60 100644 --- a/plugins/context/qtsql/Makefile.in +++ b/plugins/context/qtsql/Makefile.in @@ -172,6 +172,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -180,6 +182,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -235,6 +239,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -469,6 +474,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -541,6 +547,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -552,6 +559,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -631,6 +639,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/recordfile/Makefile.in b/plugins/context/recordfile/Makefile.in index 4a7517a..ca49e36 100644 --- a/plugins/context/recordfile/Makefile.in +++ b/plugins/context/recordfile/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/sane/Makefile.am b/plugins/context/sane/Makefile.am index 1550764..f87307c 100644 --- a/plugins/context/sane/Makefile.am +++ b/plugins/context/sane/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/sane/Makefile.in b/plugins/context/sane/Makefile.in index 29d5ba6..b94815d 100644 --- a/plugins/context/sane/Makefile.in +++ b/plugins/context/sane/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1013,7 +1022,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/sockets/Makefile.in b/plugins/context/sockets/Makefile.in index bfbaf77..f1b5242 100644 --- a/plugins/context/sockets/Makefile.in +++ b/plugins/context/sockets/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/sockets/libsocket.cpp b/plugins/context/sockets/libsocket.cpp index 3f01e09..75ca126 100644 --- a/plugins/context/sockets/libsocket.cpp +++ b/plugins/context/sockets/libsocket.cpp @@ -2056,16 +2056,16 @@ SocketListContext::SubCreateSocket( fh_context c, fh_context md ) SSL_METHOD* ssl_meth; if( sslversion == SSLVERSION2 ) { - ssl_meth = SSLv2_method(); + ssl_meth = (SSL_METHOD*)SSLv2_method(); } else if( sslversion == SSLVERSION3 ) { - ssl_meth = SSLv3_method(); + ssl_meth = (SSL_METHOD*)SSLv3_method(); } else if( sslversion == TLSVERSION1 ) { LG_SOCKET_D << "Using TLS level security." << endl; - ssl_meth = TLSv1_method(); + ssl_meth = (SSL_METHOD*)TLSv1_method(); } else if( sslversion == "None" ) { diff --git a/plugins/context/soprano/Makefile.in b/plugins/context/soprano/Makefile.in index 04f16e9..bbe7bea 100644 --- a/plugins/context/soprano/Makefile.in +++ b/plugins/context/soprano/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/spirit/Makefile.in b/plugins/context/spirit/Makefile.in index 906e376..d514488 100644 --- a/plugins/context/spirit/Makefile.in +++ b/plugins/context/spirit/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/spirit/ffilter/Makefile.in b/plugins/context/spirit/ffilter/Makefile.in index 6c18b9b..b3fa89e 100644 --- a/plugins/context/spirit/ffilter/Makefile.in +++ b/plugins/context/spirit/ffilter/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/spirit/fulltextboolean/Makefile.in b/plugins/context/spirit/fulltextboolean/Makefile.in index a1d56ac..36388b9 100644 --- a/plugins/context/spirit/fulltextboolean/Makefile.in +++ b/plugins/context/spirit/fulltextboolean/Makefile.in @@ -161,6 +161,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -169,6 +171,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -224,6 +228,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -458,6 +463,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -530,6 +536,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -541,6 +548,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -620,6 +628,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/sqlplus/Makefile.in b/plugins/context/sqlplus/Makefile.in index 1e599b7..73edf23 100644 --- a/plugins/context/sqlplus/Makefile.in +++ b/plugins/context/sqlplus/Makefile.in @@ -161,6 +161,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -169,6 +171,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -224,6 +228,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -458,6 +463,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -530,6 +536,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -541,6 +548,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -620,6 +628,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/tdb/Makefile.in b/plugins/context/tdb/Makefile.in index de8805d..64cd1db 100644 --- a/plugins/context/tdb/Makefile.in +++ b/plugins/context/tdb/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/upnp/Makefile.in b/plugins/context/upnp/Makefile.in index e6c2c9b..ab15308 100644 --- a/plugins/context/upnp/Makefile.in +++ b/plugins/context/upnp/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/vimeo/Makefile.am b/plugins/context/vimeo/Makefile.am index 41a438b..4502ea3 100644 --- a/plugins/context/vimeo/Makefile.am +++ b/plugins/context/vimeo/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisvimeo_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/vimeo/Makefile.in b/plugins/context/vimeo/Makefile.in index bbfc3f1..551710e 100644 --- a/plugins/context/vimeo/Makefile.in +++ b/plugins/context/vimeo/Makefile.in @@ -175,6 +175,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -183,6 +185,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -238,6 +242,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -472,6 +477,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -544,6 +550,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -555,6 +562,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -634,6 +642,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1082,7 +1091,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/webphotos/Makefile.am b/plugins/context/webphotos/Makefile.am index d180458..90407dd 100644 --- a/plugins/context/webphotos/Makefile.am +++ b/plugins/context/webphotos/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferriswebphotos_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/webphotos/Makefile.in b/plugins/context/webphotos/Makefile.in index 98a8c00..0926ed9 100644 --- a/plugins/context/webphotos/Makefile.in +++ b/plugins/context/webphotos/Makefile.in @@ -198,6 +198,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -206,6 +208,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -261,6 +265,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -495,6 +500,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -567,6 +573,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -578,6 +585,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -657,6 +665,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1174,7 +1183,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/wiki/Makefile.am b/plugins/context/wiki/Makefile.am index 6375a20..e1595b6 100644 --- a/plugins/context/wiki/Makefile.am +++ b/plugins/context/wiki/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferriswikishared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/wiki/Makefile.in b/plugins/context/wiki/Makefile.in index 377206c..9034a4c 100644 --- a/plugins/context/wiki/Makefile.in +++ b/plugins/context/wiki/Makefile.in @@ -164,6 +164,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -172,6 +174,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -227,6 +231,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -461,6 +466,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -533,6 +539,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -544,6 +551,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -623,6 +631,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1053,7 +1062,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ # 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 --git a/plugins/context/xml/Makefile.in b/plugins/context/xml/Makefile.in index e002018..6067b52 100644 --- a/plugins/context/xml/Makefile.in +++ b/plugins/context/xml/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/xmms/Makefile.in b/plugins/context/xmms/Makefile.in index b8f20e3..2b8e268 100644 --- a/plugins/context/xmms/Makefile.in +++ b/plugins/context/xmms/Makefile.in @@ -152,6 +152,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -160,6 +162,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -215,6 +219,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -449,6 +454,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -521,6 +527,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -532,6 +539,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -611,6 +619,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/xsltfs/Makefile.in b/plugins/context/xsltfs/Makefile.in index 817c227..e7daa70 100644 --- a/plugins/context/xsltfs/Makefile.in +++ b/plugins/context/xsltfs/Makefile.in @@ -154,6 +154,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -162,6 +164,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -217,6 +221,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -451,6 +456,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -523,6 +529,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -534,6 +541,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -613,6 +621,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/context/xwin/Makefile.am b/plugins/context/xwin/Makefile.am index 157d00e..8e6dd56 100644 --- a/plugins/context/xwin/Makefile.am +++ b/plugins/context/xwin/Makefile.am @@ -11,7 +11,7 @@ klipper_interface.cpp klipper_interface.h: klipper_interface.xml qdbusxml2cpp -c klipper -p klipper_interface $(srcdir)/klipper_interface.xml klipper_interface_public.hh: klipper_interface.h - moc-qt4 klipper_interface.h -o klipper_interface_public.hh + $(MOC) klipper_interface.h -o klipper_interface_public.hh KLIPPER_SOURCES=libferrisxwin_klipper.cpp libferrisxwin_klipper.hh \ klipper_interface.cpp klipper_interface_public.hh diff --git a/plugins/context/xwin/Makefile.in b/plugins/context/xwin/Makefile.in index 89e3655..6ef8637 100644 --- a/plugins/context/xwin/Makefile.in +++ b/plugins/context/xwin/Makefile.in @@ -171,6 +171,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -179,6 +181,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -234,6 +238,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -468,6 +473,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -540,6 +546,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -551,6 +558,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -630,6 +638,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1053,7 +1062,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES @FERRIS_HAVE_KDE_TRUE@ qdbusxml2cpp -c klipper -p klipper_interface $(srcdir)/klipper_interface.xml @FERRIS_HAVE_KDE_TRUE@klipper_interface_public.hh: klipper_interface.h -@FERRIS_HAVE_KDE_TRUE@ moc-qt4 klipper_interface.h -o klipper_interface_public.hh +@FERRIS_HAVE_KDE_TRUE@ $(MOC) klipper_interface.h -o klipper_interface_public.hh # 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 --git a/plugins/context/zoneminder/Makefile.am b/plugins/context/zoneminder/Makefile.am new file mode 100644 index 0000000..b1aaa26 --- /dev/null +++ b/plugins/context/zoneminder/Makefile.am @@ -0,0 +1,36 @@ +MOC_DEP_SRCS=libferriszoneminder_shared_moc.cpp + +%_moc.cpp: %.hh + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ +BUILT_SOURCES = $(MOC_DEP_SRCS) +CLEANFILES = $(MOC_DEP_SRCS) + +plugindir = $(libdir)/ferris/plugins/context + +INCLUDES = \ + @STLPORT_CFLAGS@ \ + -I$(srcdir)/.. \ + -I$(top_srcdir)/src \ + -I$(includedir) \ + -I/usr/local/lib \ + @QT_CFLAGS@ \ + @QTNETWORK_CFLAGS@ \ + @QTDBUS_CFLAGS@ \ + @QJSON_CFLAGS@ @QOAUTH_CFLAGS@ \ + @CFLAGS@ + +plugin_LTLIBRARIES = libferriszoneminder.la libferriszoneminder_factory.la +libferriszoneminder_factory_la_SOURCES = libferriszoneminder_factory.cpp +libferriszoneminder_factory_la_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +libferriszoneminder_factory_la_LDFLAGS = @LIBFERRIS_PLUGIN_LT_LINE@ + + +libferriszoneminder_la_SOURCES = libferriszoneminder.cpp libferriszoneminder_shared.hh +libferriszoneminder_la_LDFLAGS = @CTXZONEMINDER_LA@ @QT_LIBS@ @LIBFERRIS_PLUGIN_LT_LINE@ @QOAUTH_LIBS@ @QJSON_LIBS@ + + +noinst_LTLIBRARIES = libferriszoneminder_shared.la +nodist_libferriszoneminder_shared_la_SOURCES = $(MOC_DEP_SRCS) +libferriszoneminder_shared_la_SOURCES = \ + libferriszoneminder_shared.cpp libferriszoneminder_shared.hh + diff --git a/plugins/context/zoneminder/Makefile.in b/plugins/context/zoneminder/Makefile.in new file mode 100644 index 0000000..64ece3a --- /dev/null +++ b/plugins/context/zoneminder/Makefile.in @@ -0,0 +1,1075 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins/context/zoneminder +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/ferrismacros.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(plugindir)" +LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) +libferriszoneminder_la_LIBADD = +am_libferriszoneminder_la_OBJECTS = libferriszoneminder.lo +libferriszoneminder_la_OBJECTS = $(am_libferriszoneminder_la_OBJECTS) +libferriszoneminder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libferriszoneminder_la_LDFLAGS) $(LDFLAGS) -o $@ +libferriszoneminder_factory_la_DEPENDENCIES = +am_libferriszoneminder_factory_la_OBJECTS = \ + libferriszoneminder_factory.lo +libferriszoneminder_factory_la_OBJECTS = \ + $(am_libferriszoneminder_factory_la_OBJECTS) +libferriszoneminder_factory_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libferriszoneminder_factory_la_LDFLAGS) $(LDFLAGS) -o $@ +libferriszoneminder_shared_la_LIBADD = +am_libferriszoneminder_shared_la_OBJECTS = \ + libferriszoneminder_shared.lo +am__objects_1 = libferriszoneminder_shared_moc.lo +nodist_libferriszoneminder_shared_la_OBJECTS = $(am__objects_1) +libferriszoneminder_shared_la_OBJECTS = \ + $(am_libferriszoneminder_shared_la_OBJECTS) \ + $(nodist_libferriszoneminder_shared_la_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libferriszoneminder_la_SOURCES) \ + $(libferriszoneminder_factory_la_SOURCES) \ + $(libferriszoneminder_shared_la_SOURCES) \ + $(nodist_libferriszoneminder_shared_la_SOURCES) +DIST_SOURCES = $(libferriszoneminder_la_SOURCES) \ + $(libferriszoneminder_factory_la_SOURCES) \ + $(libferriszoneminder_shared_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +ANNODEX_CFLAGS = @ANNODEX_CFLAGS@ +ANNODEX_LIBS = @ANNODEX_LIBS@ +ANTLR = @ANTLR@ +ANTLR_H = @ANTLR_H@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BEAGLE_CFLAGS = @BEAGLE_CFLAGS@ +BEAGLE_LIBS = @BEAGLE_LIBS@ +BONOBO_CFLAGS = @BONOBO_CFLAGS@ +BONOBO_LIBS = @BONOBO_LIBS@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ +BZIP2_CFLAGS = @BZIP2_CFLAGS@ +BZIP2_LIBS = @BZIP2_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CGICC_CFLAGS = @CGICC_CFLAGS@ +CGICC_LIBS = @CGICC_LIBS@ +CLIENTUI_APP_CFLAGS = @CLIENTUI_APP_CFLAGS@ +CLIENTUI_APP_LIBS = @CLIENTUI_APP_LIBS@ +CLIENTXSLT_APP_CFLAGS = @CLIENTXSLT_APP_CFLAGS@ +CLIENTXSLT_APP_LIBS = @CLIENTXSLT_APP_LIBS@ +CLIENT_APP_CFLAGS = @CLIENT_APP_CFLAGS@ +CLIENT_APP_LIBS = @CLIENT_APP_LIBS@ +CLUCENE_CFLAGS = @CLUCENE_CFLAGS@ +CLUCENE_LIBS = @CLUCENE_LIBS@ +CMML_CFLAGS = @CMML_CFLAGS@ +CMML_LIBS = @CMML_LIBS@ +COMMONDBDIR = @COMMONDBDIR@ +COMMONDB_LA = @COMMONDB_LA@ +COMMONSQLDBDIR = @COMMONSQLDBDIR@ +COMMONSQLDBDIR_LA = @COMMONSQLDBDIR_LA@ +COMPILE_SYMBOLS_AS_PUBLIC = @COMPILE_SYMBOLS_AS_PUBLIC@ +CONTEXT_PLUGIN_CFLAGS = @CONTEXT_PLUGIN_CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ +CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ +CTXGOOGLEDIR = @CTXGOOGLEDIR@ +CTXGOOGLE_LA = @CTXGOOGLE_LA@ +CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ +CTXGSTREAMER_LA = @CTXGSTREAMER_LA@ +CTXIDENTICADIR = @CTXIDENTICADIR@ +CTXIDENTICA_LA = @CTXIDENTICA_LA@ +CTXVIMEODIR = @CTXVIMEODIR@ +CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ +CURL_CFLAGS = @CURL_CFLAGS@ +CURL_LIBS = @CURL_LIBS@ +CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXCPPFLAGS = @CXXCPPFLAGS@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DB4_CFLAGS = @DB4_CFLAGS@ +DB4_LIBS = @DB4_LIBS@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBXML_CFLAGS = @DBXML_CFLAGS@ +DBXML_LIBS = @DBXML_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DESKTOP_FILE_DIR = @DESKTOP_FILE_DIR@ +DLG = @DLG@ +DLLTOOL = @DLLTOOL@ +DOTFILE_ETC = @DOTFILE_ETC@ +DSYMUTIL = @DSYMUTIL@ +DTLMODDIR = @DTLMODDIR@ +DTL_CFLAGS = @DTL_CFLAGS@ +DTL_LIBS = @DTL_LIBS@ +DUMPBIN = @DUMPBIN@ +DVDREAD_CFLAGS = @DVDREAD_CFLAGS@ +DVDREAD_LIBS = @DVDREAD_LIBS@ +EAIDXCUSTOMFERRISDB4TREE_LA = @EAIDXCUSTOMFERRISDB4TREE_LA@ +EAIDXCUSTOMFERRISDIR = @EAIDXCUSTOMFERRISDIR@ +EAIDXCUSTOMFERRIS_LA = @EAIDXCUSTOMFERRIS_LA@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +ECORE_CFLAGS = @ECORE_CFLAGS@ +ECORE_LIBS = @ECORE_LIBS@ +EDB_CFLAGS = @EDB_CFLAGS@ +EDB_LIBS = @EDB_LIBS@ +EET_CFLAGS = @EET_CFLAGS@ +EET_LIBS = @EET_LIBS@ +EFSD_CFLAGS = @EFSD_CFLAGS@ +EFSD_LIBS = @EFSD_LIBS@ +EGREP = @EGREP@ +EMACS_GNUCLIENT_PATH = @EMACS_GNUCLIENT_PATH@ +EMACS_MOUNT_CFLAGS = @EMACS_MOUNT_CFLAGS@ +EMACS_MOUNT_LIBS = @EMACS_MOUNT_LIBS@ +EPEG_CFLAGS = @EPEG_CFLAGS@ +EPEG_LIBS = @EPEG_LIBS@ +EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE = @EVOLUTION_BUG__EXTRA_HEADERS_TO_PREINCLUDE@ +EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@ +EVOLUTION_LIBS = @EVOLUTION_LIBS@ +EXEEXT = @EXEEXT@ +FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ +FAMPP2_LIBS = @FAMPP2_LIBS@ +FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ +FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ +FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ +FERRIS_IOSIZE = @FERRIS_IOSIZE@ +FERRIS_IOSIZE_WARNING = @FERRIS_IOSIZE_WARNING@ +FERRIS_MODULE_COMPILE_LIST = @FERRIS_MODULE_COMPILE_LIST@ +FERRIS_SMARTPTR_ASSERT = @FERRIS_SMARTPTR_ASSERT@ +FERRIS_VERSION = @FERRIS_VERSION@ +FGREP = @FGREP@ +FIREFOX_MOUNT_CFLAGS = @FIREFOX_MOUNT_CFLAGS@ +FIREFOX_MOUNT_LIBS = @FIREFOX_MOUNT_LIBS@ +FLAC_CFLAGS = @FLAC_CFLAGS@ +FLAC_LIBS = @FLAC_LIBS@ +FSPOT_CFLAGS = @FSPOT_CFLAGS@ +FSPOT_LIBS = @FSPOT_LIBS@ +FSTREAM_CFLAGS = @FSTREAM_CFLAGS@ +FSTREAM_LIBS = @FSTREAM_LIBS@ +FTXIDXCUSTOMFERRISDIR = @FTXIDXCUSTOMFERRISDIR@ +FTXIDXCUSTOMFERRIS_LA = @FTXIDXCUSTOMFERRIS_LA@ +FTXIDXLUCENEANALYZERDIR = @FTXIDXLUCENEANALYZERDIR@ +FTXIDXLUCENEANALYZER_LA = @FTXIDXLUCENEANALYZER_LA@ +FXD_BINARY = @FXD_BINARY@ +FXD_BINARY_A52PIPE = @FXD_BINARY_A52PIPE@ +FXD_BINARY_NATIVE_EA = @FXD_BINARY_NATIVE_EA@ +FXD_BINARY_PGMPIPE = @FXD_BINARY_PGMPIPE@ +FXD_BINARY_RGBA32 = @FXD_BINARY_RGBA32@ +FXD_CIPHER_BITS = @FXD_CIPHER_BITS@ +FXD_CIPHER_NAME = @FXD_CIPHER_NAME@ +FXD_CIPHER_NAME_LIST = @FXD_CIPHER_NAME_LIST@ +FXD_CIPHER_VERSION = @FXD_CIPHER_VERSION@ +FXD_DIGEST = @FXD_DIGEST@ +FXD_DISTINGUISHED_PERSON = @FXD_DISTINGUISHED_PERSON@ +FXD_EANAMES = @FXD_EANAMES@ +FXD_ENUMERATED_STRING = @FXD_ENUMERATED_STRING@ +FXD_EXIF_COMPRESSION = @FXD_EXIF_COMPRESSION@ +FXD_EXIF_COPYRIGHT = @FXD_EXIF_COPYRIGHT@ +FXD_EXIF_DATETIME_STRING = @FXD_EXIF_DATETIME_STRING@ +FXD_EXIF_EXPOSURE_PROGRAM = @FXD_EXIF_EXPOSURE_PROGRAM@ +FXD_EXIF_FLASH = @FXD_EXIF_FLASH@ +FXD_EXIF_LIGHT_SOURCE = @FXD_EXIF_LIGHT_SOURCE@ +FXD_EXIF_METERING_MODE = @FXD_EXIF_METERING_MODE@ +FXD_EXIF_ORIENTATION = @FXD_EXIF_ORIENTATION@ +FXD_EXIF_SENSING_METHOD = @FXD_EXIF_SENSING_METHOD@ +FXD_EXIF_USER_COMMENT = @FXD_EXIF_USER_COMMENT@ +FXD_EXIF_VERSION = @FXD_EXIF_VERSION@ +FXD_EXIF_YCBCR_POSITIONING = @FXD_EXIF_YCBCR_POSITIONING@ +FXD_FFILTER = @FXD_FFILTER@ +FXD_FILESIZE = @FXD_FILESIZE@ +FXD_FSID_T = @FXD_FSID_T@ +FXD_FTX_RANK = @FXD_FTX_RANK@ +FXD_GID_T = @FXD_GID_T@ +FXD_GROUPNAME = @FXD_GROUPNAME@ +FXD_HEIGHT_PIXELS = @FXD_HEIGHT_PIXELS@ +FXD_INODE_T = @FXD_INODE_T@ +FXD_INT32 = @FXD_INT32@ +FXD_INT64 = @FXD_INT64@ +FXD_INTLIST = @FXD_INTLIST@ +FXD_IP4PORT = @FXD_IP4PORT@ +FXD_LATITUDE = @FXD_LATITUDE@ +FXD_LATLONG = @FXD_LATLONG@ +FXD_LONG = @FXD_LONG@ +FXD_LONGITUDE = @FXD_LONGITUDE@ +FXD_MACHINE_NAME = @FXD_MACHINE_NAME@ +FXD_MIMETYPE = @FXD_MIMETYPE@ +FXD_MODE_STRING_T = @FXD_MODE_STRING_T@ +FXD_MODE_T = @FXD_MODE_T@ +FXD_PID = @FXD_PID@ +FXD_PIXELCOUNT = @FXD_PIXELCOUNT@ +FXD_PRIMARY_KEY = @FXD_PRIMARY_KEY@ +FXD_PRIMARY_KEY_REAL = @FXD_PRIMARY_KEY_REAL@ +FXD_PRIMARY_KEY_VIRTUAL = @FXD_PRIMARY_KEY_VIRTUAL@ +FXD_STRINGLIST = @FXD_STRINGLIST@ +FXD_STR_IP4ADDR = @FXD_STR_IP4ADDR@ +FXD_UID_T = @FXD_UID_T@ +FXD_UINT32 = @FXD_UINT32@ +FXD_UINT64 = @FXD_UINT64@ +FXD_UNIT_NAME_LENGTH = @FXD_UNIT_NAME_LENGTH@ +FXD_UNIXEPOCH_STRING = @FXD_UNIXEPOCH_STRING@ +FXD_UNIXEPOCH_T = @FXD_UNIXEPOCH_T@ +FXD_URL = @FXD_URL@ +FXD_URLLIST = @FXD_URLLIST@ +FXD_URL_IMPLICIT_RESOLVE = @FXD_URL_IMPLICIT_RESOLVE@ +FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM = @FXD_URL_IMPLICIT_RESOLVE_FILESYSTEM@ +FXD_USERNAME = @FXD_USERNAME@ +FXD_WIDTH_PIXELS = @FXD_WIDTH_PIXELS@ +FXD_XLIST = @FXD_XLIST@ +FXD_XMLDOCSTRING = @FXD_XMLDOCSTRING@ +GCJ = @GCJ@ +GCJDEPMODE = @GCJDEPMODE@ +GCJFLAGS = @GCJFLAGS@ +GCJLUCENE_CFLAGS = @GCJLUCENE_CFLAGS@ +GCJLUCENE_GCJFLAGS = @GCJLUCENE_GCJFLAGS@ +GCJLUCENE_LIBS = @GCJLUCENE_LIBS@ +GCJ_CFLAGS = @GCJ_CFLAGS@ +GCJ_LIBS = @GCJ_LIBS@ +GDBM_CFLAGS = @GDBM_CFLAGS@ +GDBM_LIBS = @GDBM_LIBS@ +GIMP_MP_FLAGS = @GIMP_MP_FLAGS@ +GIMP_MP_LIBS = @GIMP_MP_LIBS@ +GIMP_THREAD_FLAGS = @GIMP_THREAD_FLAGS@ +GIMP_THREAD_LIBS = @GIMP_THREAD_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GPGME_CFLAGS = @GPGME_CFLAGS@ +GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ +GPHOTO2_CFLAGS = @GPHOTO2_CFLAGS@ +GPHOTO2_CONFIG = @GPHOTO2_CONFIG@ +GPHOTO2_LIBS = @GPHOTO2_LIBS@ +GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTKEXTRA2_CFLAGS = @GTKEXTRA2_CFLAGS@ +GTKEXTRA2_LIBS = @GTKEXTRA2_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +ID3_CFLAGS = @ID3_CFLAGS@ +ID3_LIBS = @ID3_LIBS@ +IMLIB_CFLAGS = @IMLIB_CFLAGS@ +IMLIB_LIBS = @IMLIB_LIBS@ +INCLUDEDIR = @INCLUDEDIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IOSIZE = @IOSIZE@ +IPC_CONTEXT_CFLAGS = @IPC_CONTEXT_CFLAGS@ +IPC_CONTEXT_LIBS = @IPC_CONTEXT_LIBS@ +KDE_CFLAGS = @KDE_CFLAGS@ +KDE_EAGENERATOR_CFLAGS = @KDE_EAGENERATOR_CFLAGS@ +KDE_EAGENERATOR_LIBS = @KDE_EAGENERATOR_LIBS@ +KDE_LIBS = @KDE_LIBS@ +KSANE_CFLAGS = @KSANE_CFLAGS@ +KSANE_LIBS = @KSANE_LIBS@ +LD = @LD@ +LDAPMODDIR = @LDAPMODDIR@ +LDAP_CFLAGS = @LDAP_CFLAGS@ +LDAP_LIBS = @LDAP_LIBS@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_APP = @LDFLAGS_APP@ +LIBA52_CFLAGS = @LIBA52_CFLAGS@ +LIBA52_LIBS = @LIBA52_LIBS@ +LIBAMAROK_CFLAGS = @LIBAMAROK_CFLAGS@ +LIBAMAROK_LIBS = @LIBAMAROK_LIBS@ +LIBASTEXT_PLUGIN_FACTORIES_LA = @LIBASTEXT_PLUGIN_FACTORIES_LA@ +LIBATTR_CFLAGS = @LIBATTR_CFLAGS@ +LIBATTR_LIBS = @LIBATTR_LIBS@ +LIBBTPARSE_CFLAGS = @LIBBTPARSE_CFLAGS@ +LIBBTPARSE_LIBS = @LIBBTPARSE_LIBS@ +LIBCAP_CFLAGS = @LIBCAP_CFLAGS@ +LIBCAP_LIBS = @LIBCAP_LIBS@ +LIBCREATION_PLUGIN_FACTORIES_LA = @LIBCREATION_PLUGIN_FACTORIES_LA@ +LIBDIR = @LIBDIR@ +LIBDJVULIBRE_CFLAGS = @LIBDJVULIBRE_CFLAGS@ +LIBDJVULIBRE_LIBS = @LIBDJVULIBRE_LIBS@ +LIBEAGEN_PLUGIN_FACTORIES_LA = @LIBEAGEN_PLUGIN_FACTORIES_LA@ +LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@ +LIBEXIF_LIBS = @LIBEXIF_LIBS@ +LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@ +LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@ +LIBFERRISINDEXING_LA = @LIBFERRISINDEXING_LA@ +LIBFERRISMG_LA = @LIBFERRISMG_LA@ +LIBFERRISQTGUI_LA = @LIBFERRISQTGUI_LA@ +LIBFERRISUI_LA = @LIBFERRISUI_LA@ +LIBFERRISXSLT_LA = @LIBFERRISXSLT_LA@ +LIBFERRIS_ASTEXTPLUGIN_LT_LINE = @LIBFERRIS_ASTEXTPLUGIN_LT_LINE@ +LIBFERRIS_BETA = @LIBFERRIS_BETA@ +LIBFERRIS_CREATIONPLUGIN_LT_LINE = @LIBFERRIS_CREATIONPLUGIN_LT_LINE@ +LIBFERRIS_EAPLUGIN_LT_LINE = @LIBFERRIS_EAPLUGIN_LT_LINE@ +LIBFERRIS_FULLV = @LIBFERRIS_FULLV@ +LIBFERRIS_LA = @LIBFERRIS_LA@ +LIBFERRIS_LT_AGE = @LIBFERRIS_LT_AGE@ +LIBFERRIS_LT_CURRENT = @LIBFERRIS_LT_CURRENT@ +LIBFERRIS_LT_REVISION = @LIBFERRIS_LT_REVISION@ +LIBFERRIS_MAJOR = @LIBFERRIS_MAJOR@ +LIBFERRIS_MINOR = @LIBFERRIS_MINOR@ +LIBFERRIS_PLUGIN_FACTORY_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_SMALL_LIBADD@ +LIBFERRIS_PLUGIN_LIBADD = @LIBFERRIS_PLUGIN_LIBADD@ +LIBFERRIS_PLUGIN_LT_LINE = @LIBFERRIS_PLUGIN_LT_LINE@ +LIBFILE_CFLAGS = @LIBFILE_CFLAGS@ +LIBFILE_LIBS = @LIBFILE_LIBS@ +LIBGISTMIQ_CFLAGS = @LIBGISTMIQ_CFLAGS@ +LIBGISTMIQ_LIBS = @LIBGISTMIQ_LIBS@ +LIBIMAGEMAGICKNAMESPACEGLUE_LA = @LIBIMAGEMAGICKNAMESPACEGLUE_LA@ +LIBJASPER_CFLAGS = @LIBJASPER_CFLAGS@ +LIBJASPER_LIBS = @LIBJASPER_LIBS@ +LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@ +LIBJPEG_LIBS = @LIBJPEG_LIBS@ +LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@ +LIBMAGIC_LIBS = @LIBMAGIC_LIBS@ +LIBMPEG3_CFLAGS = @LIBMPEG3_CFLAGS@ +LIBMPEG3_LIBS = @LIBMPEG3_LIBS@ +LIBMPG2_CFLAGS = @LIBMPG2_CFLAGS@ +LIBMPG2_LIBS = @LIBMPG2_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBPLATINUM_CFLAGS = @LIBPLATINUM_CFLAGS@ +LIBPLATINUM_LIBS = @LIBPLATINUM_LIBS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBPQXX_CFLAGS = @LIBPQXX_CFLAGS@ +LIBPQXX_LIBS = @LIBPQXX_LIBS@ +LIBRPM_CFLAGS = @LIBRPM_CFLAGS@ +LIBRPM_LIBS = @LIBRPM_LIBS@ +LIBS = @LIBS@ +LIBSELINUX_CFLAGS = @LIBSELINUX_CFLAGS@ +LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ +LIBTEXTCAT_CFLAGS = @LIBTEXTCAT_CFLAGS@ +LIBTEXTCAT_LIBS = @LIBTEXTCAT_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXMMS_CFLAGS = @LIBXMMS_CFLAGS@ +LIBXMMS_LIBS = @LIBXMMS_LIBS@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOKI_CFLAGS = @LOKI_CFLAGS@ +LOKI_LIBS = @LOKI_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +LT_RELEASE = @LT_RELEASE@ +MAGICK_CFLAGS = @MAGICK_CFLAGS@ +MAGICK_LIBS = @MAGICK_LIBS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ +MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ +MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ +MKDIR_P = @MKDIR_P@ +MOC = @MOC@ +MP3_CFLAGS = @MP3_CFLAGS@ +MP3_LIBS = @MP3_LIBS@ +NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ +NEPOMUK_LIBS = @NEPOMUK_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBBYMODDIR = @OBBYMODDIR@ +OBBY_CFLAGS = @OBBY_CFLAGS@ +OBBY_LIBS = @OBBY_LIBS@ +OBBY_MOUNT_CFLAGS = @OBBY_MOUNT_CFLAGS@ +OBBY_MOUNT_LIBS = @OBBY_MOUNT_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OGGZ_CFLAGS = @OGGZ_CFLAGS@ +OGGZ_LIBS = @OGGZ_LIBS@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PASTEBINDIR = @PASTEBINDIR@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PCCTS_CFLAGS = @PCCTS_CFLAGS@ +PGCTXMODDIR = @PGCTXMODDIR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLASMA_CFLAGS = @PLASMA_CFLAGS@ +PLASMA_LIBS = @PLASMA_LIBS@ +PREFIX = @PREFIX@ +PREFIXSTR = @PREFIXSTR@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +QJSON_CFLAGS = @QJSON_CFLAGS@ +QJSON_LIBS = @QJSON_LIBS@ +QOAUTH_CFLAGS = @QOAUTH_CFLAGS@ +QOAUTH_LIBS = @QOAUTH_LIBS@ +QPRINTER_CFLAGS = @QPRINTER_CFLAGS@ +QPRINTER_LIBS = @QPRINTER_LIBS@ +QTCORE_CFLAGS = @QTCORE_CFLAGS@ +QTCORE_LIBS = @QTCORE_LIBS@ +QTDBUS_CFLAGS = @QTDBUS_CFLAGS@ +QTDBUS_LIBS = @QTDBUS_LIBS@ +QTGUI_CFLAGS = @QTGUI_CFLAGS@ +QTGUI_LIBS = @QTGUI_LIBS@ +QTNETWORK_CFLAGS = @QTNETWORK_CFLAGS@ +QTNETWORK_LIBS = @QTNETWORK_LIBS@ +QTSQLCTXMODDIR = @QTSQLCTXMODDIR@ +QTSQL_CFLAGS = @QTSQL_CFLAGS@ +QTSQL_LIBS = @QTSQL_LIBS@ +QT_CFLAGS = @QT_CFLAGS@ +QT_CXXFLAGS = @QT_CXXFLAGS@ +QT_LDADD = @QT_LDADD@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +REQUIREMENTS = @REQUIREMENTS@ +REQUIREMENTSUI = @REQUIREMENTSUI@ +REQUIREMENTSXSLT = @REQUIREMENTSXSLT@ +RPM_BUILD_ROOT = @RPM_BUILD_ROOT@ +SANE_CFLAGS = @SANE_CFLAGS@ +SANE_LIBS = @SANE_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ +SHAREDLDAP_LA = @SHAREDLDAP_LA@ +SHAREDOBBY_LA = @SHAREDOBBY_LA@ +SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ +SHAREDPGCTX_LA = @SHAREDPGCTX_LA@ +SHAREDQTSQLCTX_LA = @SHAREDQTSQLCTX_LA@ +SHAREDSOPRANOEA_LA = @SHAREDSOPRANOEA_LA@ +SHAREDSQLPLUS_LA = @SHAREDSQLPLUS_LA@ +SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ +SHAREDWIKI_LA = @SHAREDWIKI_LA@ +SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ +SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ +SHELL = @SHELL@ +SIGC_CFLAGS = @SIGC_CFLAGS@ +SIGC_LIBS = @SIGC_LIBS@ +SOCKETPP_CFLAGS = @SOCKETPP_CFLAGS@ +SOCKETPP_LIBS = @SOCKETPP_LIBS@ +SOPRANOEAMODDIR = @SOPRANOEAMODDIR@ +SOPRANO_CFLAGS = @SOPRANO_CFLAGS@ +SOPRANO_LIBS = @SOPRANO_LIBS@ +SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ +SQLITE3_LIBS = @SQLITE3_LIBS@ +SQLPLUSMODDIR = @SQLPLUSMODDIR@ +SQLPLUS_CFLAGS = @SQLPLUS_CFLAGS@ +SQLPLUS_LIBS = @SQLPLUS_LIBS@ +SSHCMD = @SSHCMD@ +STLDB4_CFLAGS = @STLDB4_CFLAGS@ +STLDB4_LIBS = @STLDB4_LIBS@ +STLPORT_CFLAGS = @STLPORT_CFLAGS@ +STLPORT_LDFLAGS = @STLPORT_LDFLAGS@ +STLPORT_LIB = @STLPORT_LIB@ +STLPORT_LIBS = @STLPORT_LIBS@ +STREAMS_CFLAGS = @STREAMS_CFLAGS@ +STREAMS_LIBS = @STREAMS_LIBS@ +STRIGI_CFLAGS = @STRIGI_CFLAGS@ +STRIGI_LIBS = @STRIGI_LIBS@ +STRIP = @STRIP@ +SVMLIGHT_CFLAGS = @SVMLIGHT_CFLAGS@ +SVMLIGHT_LIBS = @SVMLIGHT_LIBS@ +SWIG_OCAML_CFLAGS = @SWIG_OCAML_CFLAGS@ +SWIG_OCAML_HEADERDIR = @SWIG_OCAML_HEADERDIR@ +SWIG_PERL_CFLAGS = @SWIG_PERL_CFLAGS@ +SWIG_PERL_PMDIR = @SWIG_PERL_PMDIR@ +SWIG_PYTHON_CFLAGS = @SWIG_PYTHON_CFLAGS@ +SWIG_PYTHON_LIBDIR = @SWIG_PYTHON_LIBDIR@ +SWIG_PYTHON_MODULEDIR = @SWIG_PYTHON_MODULEDIR@ +SYSCONFDIR = @SYSCONFDIR@ +TAGLIB_CFLAGS = @TAGLIB_CFLAGS@ +TAGLIB_LIBS = @TAGLIB_LIBS@ +TDB_CFLAGS = @TDB_CFLAGS@ +TDB_LIBS = @TDB_LIBS@ +TSEARCH2_CFLAGS = @TSEARCH2_CFLAGS@ +TSEARCH2_LIBS = @TSEARCH2_LIBS@ +UUID_LIBS = @UUID_LIBS@ +VERSION = @VERSION@ +WAV_CFLAGS = @WAV_CFLAGS@ +WAV_LIBS = @WAV_LIBS@ +WEBPHOTOSDIR = @WEBPHOTOSDIR@ +WIKIDIR = @WIKIDIR@ +XALAN_CFLAGS = @XALAN_CFLAGS@ +XALAN_LIBS = @XALAN_LIBS@ +XAPIAN_CFLAGS = @XAPIAN_CFLAGS@ +XAPIAN_CONFIG = @XAPIAN_CONFIG@ +XAPIAN_LIBS = @XAPIAN_LIBS@ +XERCESC_CFLAGS = @XERCESC_CFLAGS@ +XERCESC_LIBS = @XERCESC_LIBS@ +XERCES_INTERNAL_HEADERS_CFLAGS = @XERCES_INTERNAL_HEADERS_CFLAGS@ +XFSPROGS_CFLAGS = @XFSPROGS_CFLAGS@ +XFSPROGS_LIBS = @XFSPROGS_LIBS@ +XINE_ACFLAGS = @XINE_ACFLAGS@ +XINE_CFLAGS = @XINE_CFLAGS@ +XINE_CONFIG = @XINE_CONFIG@ +XINE_EAGENERATOR_CFLAGS = @XINE_EAGENERATOR_CFLAGS@ +XINE_EAGENERATOR_LIBS = @XINE_EAGENERATOR_LIBS@ +XINE_LIBS = @XINE_LIBS@ +XML4C_CFLAGS = @XML4C_CFLAGS@ +XML4C_LIBS = @XML4C_LIBS@ +XMP_CFLAGS = @XMP_CFLAGS@ +XMP_LIBS = @XMP_LIBS@ +XQILLA_CFLAGS = @XQILLA_CFLAGS@ +XQILLA_LIBS = @XQILLA_LIBS@ +XSD_BASIC_BOOL = @XSD_BASIC_BOOL@ +XSD_BASIC_DOUBLE = @XSD_BASIC_DOUBLE@ +XSD_BASIC_FLOAT = @XSD_BASIC_FLOAT@ +XSD_BASIC_INT = @XSD_BASIC_INT@ +XSD_BASIC_INTEGER = @XSD_BASIC_INTEGER@ +XSD_BASIC_STRING = @XSD_BASIC_STRING@ +XSD_SCHEMA = @XSD_SCHEMA@ +XSD_UNKNOWN = @XSD_UNKNOWN@ +XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ +XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_GCJ = @ac_ct_GCJ@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_bogofilter = @have_bogofilter@ +have_bonobo = @have_bonobo@ +have_curl = @have_curl@ +have_dbus = @have_dbus@ +have_edb = @have_edb@ +have_eet = @have_eet@ +have_efsd = @have_efsd@ +have_epeg = @have_epeg@ +have_fsh = @have_fsh@ +have_hevea = @have_hevea@ +have_imlib2 = @have_imlib2@ +have_lynx = @have_lynx@ +have_magick = @have_magick@ +have_openssl = @have_openssl@ +have_ps2ascii = @have_ps2ascii@ +have_stlportcfg = @have_stlportcfg@ +have_swig_ocaml = @have_swig_ocaml@ +have_swig_perl = @have_swig_perl@ +have_swig_python = @have_swig_python@ +have_unrtf = @have_unrtf@ +have_wv = @have_wv@ +have_xmms = @have_xmms@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sqlite3_CFLAGS = @sqlite3_CFLAGS@ +sqlite3_LIBS = @sqlite3_LIBS@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MOC_DEP_SRCS = libferriszoneminder_shared_moc.cpp +BUILT_SOURCES = $(MOC_DEP_SRCS) +CLEANFILES = $(MOC_DEP_SRCS) +plugindir = $(libdir)/ferris/plugins/context +INCLUDES = \ + @STLPORT_CFLAGS@ \ + -I$(srcdir)/.. \ + -I$(top_srcdir)/src \ + -I$(includedir) \ + -I/usr/local/lib \ + @QT_CFLAGS@ \ + @QTNETWORK_CFLAGS@ \ + @QTDBUS_CFLAGS@ \ + @QJSON_CFLAGS@ @QOAUTH_CFLAGS@ \ + @CFLAGS@ + +plugin_LTLIBRARIES = libferriszoneminder.la libferriszoneminder_factory.la +libferriszoneminder_factory_la_SOURCES = libferriszoneminder_factory.cpp +libferriszoneminder_factory_la_LIBADD = @LIBFERRIS_PLUGIN_FACTORY_LIBADD@ +libferriszoneminder_factory_la_LDFLAGS = @LIBFERRIS_PLUGIN_LT_LINE@ +libferriszoneminder_la_SOURCES = libferriszoneminder.cpp libferriszoneminder_shared.hh +libferriszoneminder_la_LDFLAGS = @CTXZONEMINDER_LA@ @QT_LIBS@ @LIBFERRIS_PLUGIN_LT_LINE@ @QOAUTH_LIBS@ @QJSON_LIBS@ +noinst_LTLIBRARIES = libferriszoneminder_shared.la +nodist_libferriszoneminder_shared_la_SOURCES = $(MOC_DEP_SRCS) +libferriszoneminder_shared_la_SOURCES = \ + libferriszoneminder_shared.cpp libferriszoneminder_shared.hh + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/context/zoneminder/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/context/zoneminder/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -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 +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_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 +libferriszoneminder.la: $(libferriszoneminder_la_OBJECTS) $(libferriszoneminder_la_DEPENDENCIES) + $(libferriszoneminder_la_LINK) -rpath $(plugindir) $(libferriszoneminder_la_OBJECTS) $(libferriszoneminder_la_LIBADD) $(LIBS) +libferriszoneminder_factory.la: $(libferriszoneminder_factory_la_OBJECTS) $(libferriszoneminder_factory_la_DEPENDENCIES) + $(libferriszoneminder_factory_la_LINK) -rpath $(plugindir) $(libferriszoneminder_factory_la_OBJECTS) $(libferriszoneminder_factory_la_LIBADD) $(LIBS) +libferriszoneminder_shared.la: $(libferriszoneminder_shared_la_OBJECTS) $(libferriszoneminder_shared_la_DEPENDENCIES) + $(CXXLINK) $(libferriszoneminder_shared_la_OBJECTS) $(libferriszoneminder_shared_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferriszoneminder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferriszoneminder_factory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferriszoneminder_shared.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libferriszoneminder_shared_moc.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + 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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-pluginLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: all check install install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-pluginLTLIBRARIES \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + 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-pluginLTLIBRARIES + + +%_moc.cpp: %.hh + $(MOC) $(DEFINES) $(INCPATH) $< -o $@ + +# 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. +.NOEXPORT: diff --git a/plugins/context/zoneminder/libferriszoneminder.cpp b/plugins/context/zoneminder/libferriszoneminder.cpp new file mode 100644 index 0000000..34f2236 --- /dev/null +++ b/plugins/context/zoneminder/libferriszoneminder.cpp @@ -0,0 +1,510 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2009 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresql.cpp,v 1.11 2009/04/18 21:30:09 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "libferriszoneminder_shared.hh" +#include + +using namespace std; + +//#define DEBUG cerr +#define DEBUG LG_ZONEMINDER_D + +namespace Ferris +{ + extern "C" + { + FERRISEXP_EXPORT fh_context Brew( RootContextFactory* rf ) + throw( RootContextCreationFailed ); + }; + + using namespace Zoneminder; + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + template < class ParentCtx > + class FERRISEXP_CTXPLUGIN ZoneminderContextBase + : + public ParentCtx + { + public: + ZoneminderContextBase( Context* parent, const std::string& rdn ) + : + ParentCtx( parent, rdn ) + { + } + fh_zoneminder getZoneminder(); + + protected: + + private: + + }; + + + /******************************/ + /******************************/ + /******************************/ + + class FERRISEXP_CTXPLUGIN ZoneminderEventFrameContext + : + public ZoneminderContextBase< leafContext > + { + typedef ZoneminderContextBase< leafContext > _Base; + typedef ZoneminderEventFrameContext _Self; + int m_frame; + + public: + ZoneminderEventFrameContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + , m_frame(0) + { + } + void setup( int frame ) + { + fh_zoneminder zm = getZoneminder(); + m_frame = frame; + } + + fh_istream + priv_getIStream( ferris_ios::openmode m ) + throw (FerrisParentNotSetError, + CanNotGetStream, + std::exception) + { + stringmap_t args; + args["skin"] = "xml"; + args["view"] = "actions"; + args["action"] = "vframe"; + args["eid"] = getStrAttr( getParent(), "id", "" ); + args["frame"] = tostr(m_frame); + args["foo"] = "bar"; + + fh_zoneminder zm = getZoneminder(); + QNetworkReply* reply = zm->post( args ); + + QUrl possibleRedirectUrl = + reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); + + if( !tostr(possibleRedirectUrl.toString()).empty() ) + { + std::string earl = tostr(possibleRedirectUrl.toString()); + DEBUG << "1 redirected to:" << earl << endl; + if( starts_with( earl, "./" )) + { + earl = zm->getBaseURI() + earl; + } + DEBUG << "2 redirected to:" << earl << endl; + + QNetworkRequest request; + request.setUrl( QUrl( earl.c_str() )); + reply = zm->getQManager()->post( request, QByteArray() ); + wait( reply ); + } + + fh_stringstream ret; + ret << tostr( reply->readAll() ); + return ret; + } + + protected: + + + private: + + }; + + /******************************/ + /******************************/ + /******************************/ + + class FERRISEXP_CTXPLUGIN ZoneminderEventContext + : + public ZoneminderContextBase< FakeInternalContext > + { + typedef ZoneminderContextBase< FakeInternalContext > _Base; + typedef ZoneminderEventContext _Self; + + public: + ZoneminderEventContext( Context* parent, const std::string& rdn ) + : + _Base( parent, rdn ) + { + } + void setup( const DOMElement* e ) + { + fh_zoneminder zm = getZoneminder(); + + addAttribute( "id", getStrSubCtx( e, "ID" ) ); + addAttribute( "event-name", getStrSubCtx( e, "NAME" ) ); + addAttribute( "duration", getStrSubCtx( e, "DURATION" ) ); + addAttribute( "frames", getStrSubCtx( e, "FRAMES" ) ); + addAttribute( "fps", getStrSubCtx( e, "FPS" ) ); + addAttribute( "score-total", getStrSubCtx( e, "TOTSCORE" ) ); + addAttribute( "score-average", getStrSubCtx( e, "AVGSCORE" ) ); + addAttribute( "score-max", getStrSubCtx( e, "MAXSCORE" ) ); + + int totalFrames = toint( getStrSubCtx( e, "FRAMES" ) ); + int fps = toint( getStrSubCtx( e, "FPS" ) ); + DEBUG << "totalFrames:" << totalFrames << endl; + DEBUG << "fps:" << fps << endl; + if( !fps ) fps = 1; + + int skip = totalFrames / fps; + for( int i = 0; i < totalFrames; i+=skip ) + { + stringstream ss; + ss << "frame-" << i << ".jpg"; + string rdn = ss.str(); + + ZoneminderEventFrameContext* c = 0; + c = priv_ensureSubContext( rdn, c ); + c->setup( i ); + } + } + + protected: + + + private: + + }; + + + + /******************************/ + /******************************/ + /******************************/ + + class FERRISEXP_CTXPLUGIN ZoneminderMonitorContextBase + : + public ZoneminderContextBase< FakeInternalContext > + { + typedef ZoneminderContextBase< FakeInternalContext > _Base; + typedef ZoneminderMonitorContextBase _Self; + + public: + + ZoneminderMonitorContextBase( Context* parent, const std::string& rdn ) + : + _Base( parent, rdn ) + { + } + + fh_iostream getIsActive( Context* c, const std::string& rdn, EA_Atom* atom ) + { + fh_stringstream ss; + ss << ( getStrAttr( c, "state", "" ) == "OK" ); + return ss; + } + + std::string priv_getRecommendedEA() + { + static string rea = "name,id,active,function,width,height"; + return rea; + } + std::string getID() + { + string ret = getStrAttr( this, "id", "" ); + if( ret.empty() && isParentBound() ) + ret = getStrAttr( getParent(), "id", "" ); + return ret; + } + + protected: + + ferris_ios::openmode + getSupportedOpenModes() + { + return + ios_base::in | + std::ios::in | + ios_base::binary ; + } + fh_istream + priv_getIStream( ferris_ios::openmode m ) + throw (FerrisParentNotSetError, + CanNotGetStream, + std::exception) + { + stringmap_t args; + args["skin"] = "xml"; + args["view"] = "actions"; + args["action"] = "feed"; + args["monitor"] = getID(); + args["vcodec"] = "mjpeg"; + args["fps"] = "0"; + args["foo"] = "bar"; + + fh_zoneminder zm = getZoneminder(); + QNetworkReply* reply = zm->post( args ); + string img = tostr( reply->readAll() ); + DEBUG << "image url 1:" << img << endl; + img = regex_match_single( img, ".*liveStream\" src=\"([^\"]*)\".*" ); + DEBUG << "image url 2:" << img << endl; + img = Util::replace_all( img, "&", "&" ); + + DEBUG << "image url e:" << img << endl; + fh_context z = Resolve( img ); + return z->getIStream(); + } + }; + + + + class FERRISEXP_CTXPLUGIN ZoneminderMonitorContext + : + public ZoneminderMonitorContextBase + { + typedef ZoneminderMonitorContextBase _Base; + typedef ZoneminderMonitorContext _Self; + + public: + + ZoneminderMonitorContext( Context* parent, const std::string& rdn ) + : + _Base( parent, rdn ) + { + } + + void setup( const DOMElement* e ) + { + fh_zoneminder zm = getZoneminder(); + + addAttribute( "id", getStrSubCtx( e, "ID" ) ); + addAttribute( "enabled", getStrSubCtx( e, "ENABLED" ) ); + addAttribute( "function", getStrSubCtx( e, "FUNCTION" ) ); + addAttribute( "state", getStrSubCtx( e, "STATE" ) ); + addAttribute( "width", getStrSubCtx( e, "WIDTH" ) ); + addAttribute( "height", getStrSubCtx( e, "HEIGHT" ) ); + addAttribute( "active", this, &_Self::getIsActive ); + + clearContext(); + FakeInternalContext* fic = 0; + fic = priv_ensureSubContext( "events", fic ); + std::list< DOMElement* > del = XML::getAllChildrenElements( (DOMNode*)e, "EVENT" ); + DEBUG << "events.sz:" << del.size() << endl; + for( std::list< DOMElement* >::iterator di = del.begin(); di != del.end(); ++di ) + { + string rdn = getStrSubCtx( *di, "TIME" ); + string id = getStrSubCtx( *di, "ID" ); + + rdn = Util::replace_all(rdn, "/","-"); + DEBUG << "adding event:" << rdn << endl; + + ZoneminderEventContext* c = 0; + c = fic->priv_ensureSubContext( rdn, c ); + c->setup( *di ); + } + + ZoneminderMonitorContextBase* liveCtx = 0; + liveCtx = priv_ensureSubContext( "live.jpg", liveCtx ); + + } + + private: + + }; + + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + class FERRISEXP_CTXPLUGIN ZoneminderServerContext + : + public FakeInternalContext + { + typedef FakeInternalContext _Base; + typedef ZoneminderServerContext _Self; + bool m_haveTriedToRead; + fh_zoneminder m_zm; + userpass_t getUserPass( const std::string& server ); + time_t m_readTime; + + + + public: + + ZoneminderServerContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + , m_zm( Factory::getZoneminder( rdn ) ) + , m_haveTriedToRead( false ) + , m_readTime( 0 ) + { + DEBUG << "ctor, have read:" << getHaveReadDir() << endl; + getZoneminder()->ensureAuthenticated(); + + } + + fh_zoneminder getZoneminder() + { + return m_zm; + } + + + void priv_read() + { + DEBUG << "priv_read() url:" << getURL() + << " m_haveTriedToRead:" << m_haveTriedToRead + << " have read:" << getHaveReadDir() + << " subc.sz:" << getSubContextCount() + << endl; + +// if( getSubContextCount() ) + time_t now = Time::getTime(); + if( m_readTime && now - m_readTime < 60 ) + { + EnsureStartStopReadingIsFiredRAII _raii1( this ); + emitExistsEventForEachItemRAII _raii2( this ); + return; + } + + m_readTime = now; + stringmap_t args; + args["skin"] = "xml"; + args["view"] = "console"; + args["numEvents"] = "50"; + + fh_zoneminder zm = getZoneminder(); + EnsureStartStopReadingIsFiredRAII _raii1( this ); + QNetworkReply* reply = zm->post( args ); + fh_domdoc dom = zm->toDOM( reply ); + XML::DOMElementList_t del = XML::evalXPathToElements( dom, "/ZM_XML/MONITOR_LIST/MONITOR" ); + DEBUG << "monitors.sz:" << del.size() << endl; + for( XML::DOMElementList_t::iterator di = del.begin(); di != del.end(); ++di ) + { + string rdn = getStrSubCtx( *di, "NAME" ); + DEBUG << "monitor.id:" << rdn << endl; + + ZoneminderMonitorContext* c = 0; + c = priv_ensureSubContext( rdn, c ); + c->setup( *di ); + } + + // { + // ZoneminderStatusContext* c = 0; + // c = priv_ensureSubContext( "status", c ); + // } + } + }; + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + + class FERRISEXP_CTXPLUGIN ZoneminderRootContext + : + public networkRootContext< ZoneminderServerContext > + { + typedef networkRootContext< ZoneminderServerContext > _Base; + + public: + + ZoneminderRootContext( Context* parent, const std::string& rdn ) + : _Base( parent, rdn ) + { + tryAugmentLocalhostNames(); + DEBUG << "ctor, have read:" << getHaveReadDir() << endl; + } + + }; + + + + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + /*******************************************************************************/ + + template < class ParentCtx > + fh_zoneminder ZoneminderContextBase::getZoneminder() + { + ZoneminderServerContext* p = 0; + p = ParentCtx::getFirstParentOfContextClass( p ); + return p->getZoneminder(); + } + + + extern "C" + { + fh_context Brew( RootContextFactory* rf ) + throw( RootContextCreationFailed ) + { + try + { + DEBUG << "Brew()" << endl; + + static ZoneminderRootContext* c = 0; + if( !c ) + { + c = new ZoneminderRootContext(0, "/" ); + // Bump ref count. + static fh_context keeper = c; + static fh_context keeper2 = keeper; + DEBUG << "hi there" << endl; + } + fh_context ret = c; + + return ret; + } + catch( FerrisSqlServerNameNotFound& e ) + { + Throw_RootContextCreationFailed( e.what(), 0 ); + } + catch( exception& e ) + { + LG_PG_W << "e:" << e.what() << endl; + Throw_RootContextCreationFailed( e.what(), 0 ); + } + } + } + +}; diff --git a/plugins/context/zoneminder/libferriszoneminder_factory.cpp b/plugins/context/zoneminder/libferriszoneminder_factory.cpp new file mode 100644 index 0000000..c71463d --- /dev/null +++ b/plugins/context/zoneminder/libferriszoneminder_factory.cpp @@ -0,0 +1,56 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresql_factory.cpp,v 1.1 2005/07/12 04:04:30 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include + +using namespace std; +namespace Ferris +{ + extern "C" + { + FERRISEXP_EXPORT fh_ommatchers GetOverMountMatchers(RootContextFactory* rf) + { + fh_ommatchers ret; + fh_matcher m = Factory::MakeAlwaysFalseMatcher(); + ret.push_back( m ); + return ret; + } + + FERRISEXP_EXPORT string getName() + { + return "zoneminder"; + } + + FERRISEXP_EXPORT bool isTopLevel() + { + return true; + } + } + +}; diff --git a/plugins/context/zoneminder/libferriszoneminder_shared.cpp b/plugins/context/zoneminder/libferriszoneminder_shared.cpp new file mode 100644 index 0000000..f8e7fe8 --- /dev/null +++ b/plugins/context/zoneminder/libferriszoneminder_shared.cpp @@ -0,0 +1,323 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresqlshared.cpp,v 1.2 2006/12/07 06:49:42 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#include "config.h" + +#include "libferriszoneminder_shared.hh" +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#define DEBUG LG_ZONEMINDER_D +//#define DEBUG cerr + +using namespace std; + +namespace Ferris +{ + namespace Zoneminder + { + static const string DBNAME = FDB_SECURE; + + FERRISEXP_EXPORT userpass_t getUserPass( + const std::string& server ) + { + string user; + string pass; + + string Key = server; + + { + fh_stringstream ss; + ss << "zoneminder--" << Key << "-username"; + user = getEDBString( DBNAME, tostr(ss), "" ); + } + + { + fh_stringstream ss; + ss << "zoneminder--" << Key << "-password"; + pass = getEDBString( DBNAME, tostr(ss), "" ); + } + + return make_pair( user, pass ); + } + + FERRISEXP_EXPORT void setUserPass( + const std::string& server, + const std::string& user, const std::string& pass ) + { + string Key = server; + + { + fh_stringstream ss; + ss << "zoneminder--" << Key << "-username"; + setEDBString( DBNAME, tostr(ss), user ); + } + + { + fh_stringstream ss; + ss << "zoneminder--" << Key << "-password"; + setEDBString( DBNAME, tostr(ss), pass ); + } + } + + + //////////////////// + + using namespace XML; + using namespace std; + + const char* CFG_ZONEMINDER_USERNAME_K = "zoneminder-username"; + const char* CFG_ZONEMINDER_USERNAME_DEF = ""; + + const char* CFG_ZONEMINDER_FULLNAME_K = "zoneminder-fullname"; + const char* CFG_ZONEMINDER_FULLNAME_DEF = ""; + + const char* CFG_ZONEMINDER_AUTH_TOKEN_K = "zoneminder-auth-token"; + const char* CFG_ZONEMINDER_AUTH_TOKEN_DEF = ""; + + const char* CFG_ZONEMINDER_UID_K = "zoneminder-uid"; + const char* CFG_ZONEMINDER_UID_DEF = ""; + + + typedef std::list< DOMElement* > entries_t; + + std::string getChildElementText( DOMNode* node, const std::string& name ) + { + DOMElement* e = getChildElement( node, name ); + return e ? getChildText( e ) : ""; + } + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + + static QOAuth::ParamMap topm( stringmap_t sm ) + { + QOAuth::ParamMap ret; + for( stringmap_t::iterator iter = sm.begin(); iter != sm.end(); ++iter ) + { + ret.insert( iter->first.c_str(), iter->second.c_str() ); + } + return ret; + } + + static stringmap_t frompm( QOAuth::ParamMap pm ) + { + stringmap_t ret; + typedef QOAuth::ParamMap::iterator iter_t; + for( QOAuth::ParamMap::iterator iter = pm.begin(); iter != pm.end(); ++iter ) + { + ret.insert( make_pair( tostr(iter.key()), tostr(iter.value())) ); + } + return ret; + } + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + + QNetworkAccessManager* + Zoneminder::getQManager() + { + return ::Ferris::getQManager(); + } + + Zoneminder::Zoneminder( const std::string& server ) + : m_serverURI( server ) + { + } + + Zoneminder::~Zoneminder() + { + } + + + bool + Zoneminder::ensureAuthenticated() + { + if( isAuthenticated() ) + return true; + + userpass_t up = ::Ferris::Zoneminder::getUserPass( m_serverURI ); + + stringstream earlss; + earlss << "http://" << m_serverURI << "/zm/"; + earlss << "/index.php"; + earlss << "?action=login"; + earlss << "&username=" + up.first; + earlss << "&password=" + up.second + "&foo=bar"; + + QNetworkRequest request; + if( up.first.empty() ) + return false; + request.setUrl(QUrl( earlss.str().c_str() )); + DEBUG << "authenticating with server using url: " << earlss.str() << endl; + QNetworkReply *reply = post( request, QByteArray() ); + QByteArray ba = reply->readAll(); + DEBUG << "ba:" << tostr(ba) << endl; + m_authenticated = true; + return m_authenticated; + } + + std::string + Zoneminder::getBaseURI() const + { + return "http://" + m_serverURI + "/zm/"; + } + + + fh_domdoc + Zoneminder::toDOM( const QByteArray& ba ) + { + fh_domdoc dom = Factory::StringToDOM( tostr(ba) ); + DOMElement* e = dom->getDocumentElement(); + return dom; + } + + fh_domdoc + Zoneminder::toDOM( QNetworkReply* r ) + { + QByteArray ba = r->readAll(); + DEBUG << "todom, readAll() gave:" << tostr(ba) << endl; + return toDOM( ba ); + } + + + bool + Zoneminder::isAuthenticated() const + { + return m_authenticated; + } + + + QNetworkRequest + Zoneminder::sign( std::string earlTail, stringmap_t args ) + { + QNetworkRequest request; + request.setUrl( QUrl( ("http://" + m_serverURI + earlTail).c_str() ) ); + DEBUG << "sign(et 1) url:" << tostr(request.url().toString()) << endl; + request = sign( request, args ); + DEBUG << "sign(et 2) url:" << tostr(request.url().toString()) << endl; + DEBUG << "sign(et 2) auth:" << tostr(request.rawHeader("Authorization")) << endl; + return request; + } + + + QNetworkRequest + Zoneminder::sign( QNetworkRequest request, stringmap_t args ) + { + DEBUG << "sign(1) url:" << tostr(request.url().toString()) << endl; + QOAuth::ParamMap inp = topm( args ); + + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "sign.x:" << tostr(x) << endl; + DEBUG << "sign.args.sz:" << args.size() << endl; + url.setEncodedUrl( x.toUtf8() ); + url = addQueryItems( url, args ); +// x.append( m_qauth->inlineParameters( inp, QOAuth::ParseForInlineQuery ) ); + request.setUrl( url ); +// request.setRawHeader( "Authorization", header ); + DEBUG << "sign(2) url:" << tostr(request.url().toString()) << endl; + return request; + } + + QNetworkReply* + Zoneminder::post( std::string earlTail, stringmap_t args, QByteArray content ) + { + QNetworkRequest request = sign( earlTail, args ); + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "post.x:" << tostr(x) << endl; + QNetworkReply* reply = post( request, content ); + return reply; + } + + + QNetworkReply* + Zoneminder::post( stringmap_t args, QByteArray content ) + { + std::string earlTail = "/zm/index.php"; + QNetworkRequest request = sign( earlTail, args ); + QUrl url = request.url(); + QString x = url.toString(); + DEBUG << "post.x:" << tostr(x) << endl; + QNetworkReply* reply = post( request, content ); + return reply; + } + + + + QNetworkReply* + Zoneminder::post( QNetworkRequest request, QByteArray content ) + { + QNetworkReply* reply = getQManager()->post( request, content ); + wait( reply ); + return reply; + } + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + }; + + namespace Factory + { + ::Ferris::Zoneminder::fh_zoneminder getZoneminder( const std::string& server ) + { + ::Ferris::Zoneminder::fh_zoneminder ret( new ::Ferris::Zoneminder::Zoneminder( server ) ); + return ret; + } + + }; + + + + /****************************************/ + /****************************************/ + /****************************************/ + +}; diff --git a/plugins/context/zoneminder/libferriszoneminder_shared.hh b/plugins/context/zoneminder/libferriszoneminder_shared.hh new file mode 100644 index 0000000..563b679 --- /dev/null +++ b/plugins/context/zoneminder/libferriszoneminder_shared.hh @@ -0,0 +1,117 @@ +/****************************************************************************** +******************************************************************************* +******************************************************************************* + + libferris + Copyright (C) 2001 Ben Martin + + libferris is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + libferris is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libferris. If not, see . + + For more details see the COPYING file in the root directory of this + distribution. + + $Id: libferrispostgresqlshared.hh,v 1.2 2006/12/07 06:49:42 ben Exp $ + +******************************************************************************* +******************************************************************************* +******************************************************************************/ + +#ifndef _ALREADY_INCLUDED_FERRIS_SHARED_ZONEMINDER_H_ +#define _ALREADY_INCLUDED_FERRIS_SHARED_ZONEMINDER_H_ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace QOAuth +{ + class Interface; +}; + +namespace Ferris +{ + namespace Zoneminder + { + FERRISEXP_EXPORT userpass_t getUserPass( const std::string& server ); + FERRISEXP_EXPORT void setUserPass( const std::string& server, + const std::string& user, const std::string& pass ); + + /********************************************************************************/ + /********************************************************************************/ + /********************************************************************************/ + + class Zoneminder; + FERRIS_SMARTPTR( Zoneminder, fh_zoneminder ); + + class FERRISEXP_API Zoneminder + : + public QObject, + public Handlable + { + Q_OBJECT; + + + std::string m_serverURI; //< Base to prepend to partial URL fragments + bool m_authenticated; + + + public: + + Zoneminder( const std::string& server ); + virtual ~Zoneminder(); + + QNetworkAccessManager* getQManager(); + + fh_domdoc toDOM( const QByteArray& ba ); + fh_domdoc toDOM( QNetworkReply* r ); + + bool isAuthenticated() const; + bool ensureAuthenticated(); + + std::string getBaseURI() const; + QNetworkRequest sign( std::string earlTail, stringmap_t args ); + QNetworkRequest sign( QNetworkRequest request, stringmap_t args ); + + + QNetworkReply* post( stringmap_t args, QByteArray content = QByteArray() ); + QNetworkReply* post( std::string earlTail, stringmap_t args, QByteArray content = QByteArray() ); + QNetworkReply* post( QNetworkRequest request, QByteArray content = QByteArray() ); + }; + + + /****************************************/ + /****************************************/ + /****************************************/ + }; + + /****************************************/ + /****************************************/ + /****************************************/ + + namespace Factory + { + Zoneminder::fh_zoneminder getZoneminder( const std::string& server ); + }; +}; + +#endif diff --git a/plugins/creation/Makefile.in b/plugins/creation/Makefile.in index b3c31c4..f6dabb5 100644 --- a/plugins/creation/Makefile.in +++ b/plugins/creation/Makefile.in @@ -133,6 +133,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -141,6 +143,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -196,6 +200,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -430,6 +435,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -502,6 +508,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -513,6 +520,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -592,6 +600,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/db4/Makefile.in b/plugins/creation/db4/Makefile.in index 528a08a..1fcf1ad 100644 --- a/plugins/creation/db4/Makefile.in +++ b/plugins/creation/db4/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/dbxml/Makefile.in b/plugins/creation/dbxml/Makefile.in index 7f68e82..21b5305 100644 --- a/plugins/creation/dbxml/Makefile.in +++ b/plugins/creation/dbxml/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/devsource/Makefile.in b/plugins/creation/devsource/Makefile.in index fb0c8d2..e9078d6 100644 --- a/plugins/creation/devsource/Makefile.in +++ b/plugins/creation/devsource/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/eaindex/Makefile.in b/plugins/creation/eaindex/Makefile.in index 8a2ce5c..52edea1 100644 --- a/plugins/creation/eaindex/Makefile.in +++ b/plugins/creation/eaindex/Makefile.in @@ -157,6 +157,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -165,6 +167,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -220,6 +224,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -454,6 +459,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -526,6 +532,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -537,6 +544,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -616,6 +624,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/eaindexgeneric/Makefile.in b/plugins/creation/eaindexgeneric/Makefile.in index 86dc924..fbd1e5d 100644 --- a/plugins/creation/eaindexgeneric/Makefile.in +++ b/plugins/creation/eaindexgeneric/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/fulltextindex/Makefile.in b/plugins/creation/fulltextindex/Makefile.in index 2398026..7c1d967 100644 --- a/plugins/creation/fulltextindex/Makefile.in +++ b/plugins/creation/fulltextindex/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/fulltextindexgeneric/Makefile.in b/plugins/creation/fulltextindexgeneric/Makefile.in index 0a6b410..11aadfa 100644 --- a/plugins/creation/fulltextindexgeneric/Makefile.in +++ b/plugins/creation/fulltextindexgeneric/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/gdbm/Makefile.in b/plugins/creation/gdbm/Makefile.in index 60577d8..0f1f6fe 100644 --- a/plugins/creation/gdbm/Makefile.in +++ b/plugins/creation/gdbm/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/magickimage/Makefile.in b/plugins/creation/magickimage/Makefile.in index 3b50070..f23d71a 100644 --- a/plugins/creation/magickimage/Makefile.in +++ b/plugins/creation/magickimage/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/markup/Makefile.in b/plugins/creation/markup/Makefile.in index ef5474a..25732e6 100644 --- a/plugins/creation/markup/Makefile.in +++ b/plugins/creation/markup/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/mng/Makefile.in b/plugins/creation/mng/Makefile.in index a987b0f..f11a9f9 100644 --- a/plugins/creation/mng/Makefile.in +++ b/plugins/creation/mng/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/mp3/Makefile.in b/plugins/creation/mp3/Makefile.in index 41436db..8393ab7 100644 --- a/plugins/creation/mp3/Makefile.in +++ b/plugins/creation/mp3/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/mpeg2/Makefile.in b/plugins/creation/mpeg2/Makefile.in index 160106f..07c40fc 100644 --- a/plugins/creation/mpeg2/Makefile.in +++ b/plugins/creation/mpeg2/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/ogg/Makefile.in b/plugins/creation/ogg/Makefile.in index 724fc6b..8141f51 100644 --- a/plugins/creation/ogg/Makefile.in +++ b/plugins/creation/ogg/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/shellscript/Makefile.in b/plugins/creation/shellscript/Makefile.in index ff1b6b8..74e987c 100644 --- a/plugins/creation/shellscript/Makefile.in +++ b/plugins/creation/shellscript/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/soprano/Makefile.in b/plugins/creation/soprano/Makefile.in index a83cee2..4ec233f 100644 --- a/plugins/creation/soprano/Makefile.in +++ b/plugins/creation/soprano/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/tdb/Makefile.in b/plugins/creation/tdb/Makefile.in index 2a0208e..15dd2b4 100644 --- a/plugins/creation/tdb/Makefile.in +++ b/plugins/creation/tdb/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/creation/wav/Makefile.in b/plugins/creation/wav/Makefile.in index 101dccf..487df8b 100644 --- a/plugins/creation/wav/Makefile.in +++ b/plugins/creation/wav/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/Makefile.in b/plugins/eagenerators/Makefile.in index 16d8b8c..356d5cf 100644 --- a/plugins/eagenerators/Makefile.in +++ b/plugins/eagenerators/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/a52/Makefile.in b/plugins/eagenerators/a52/Makefile.in index da15fe7..73dec0a 100644 --- a/plugins/eagenerators/a52/Makefile.in +++ b/plugins/eagenerators/a52/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/djvu/Makefile.in b/plugins/eagenerators/djvu/Makefile.in index b3fa59b..0104aa9 100644 --- a/plugins/eagenerators/djvu/Makefile.in +++ b/plugins/eagenerators/djvu/Makefile.in @@ -140,6 +140,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -148,6 +150,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -203,6 +207,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -437,6 +442,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -509,6 +515,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -520,6 +527,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -599,6 +607,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/exif/Makefile.in b/plugins/eagenerators/exif/Makefile.in index 3a6e64d..266f703 100644 --- a/plugins/eagenerators/exif/Makefile.in +++ b/plugins/eagenerators/exif/Makefile.in @@ -149,6 +149,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -157,6 +159,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -212,6 +216,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -446,6 +451,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -518,6 +524,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -529,6 +536,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -608,6 +616,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/flac/Makefile.in b/plugins/eagenerators/flac/Makefile.in index 018faf4..8861638 100644 --- a/plugins/eagenerators/flac/Makefile.in +++ b/plugins/eagenerators/flac/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/fspot/Makefile.in b/plugins/eagenerators/fspot/Makefile.in index f7e1bdd..c96d48e 100644 --- a/plugins/eagenerators/fspot/Makefile.in +++ b/plugins/eagenerators/fspot/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/gimp/Makefile.in b/plugins/eagenerators/gimp/Makefile.in index 0e1b693..9c1b44e 100644 --- a/plugins/eagenerators/gimp/Makefile.in +++ b/plugins/eagenerators/gimp/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/id3/Makefile.in b/plugins/eagenerators/id3/Makefile.in index e455f55..cd85158 100644 --- a/plugins/eagenerators/id3/Makefile.in +++ b/plugins/eagenerators/id3/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/imlib2/Makefile.in b/plugins/eagenerators/imlib2/Makefile.in index 25674fa..e650fca 100644 --- a/plugins/eagenerators/imlib2/Makefile.in +++ b/plugins/eagenerators/imlib2/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/jasper/Makefile.in b/plugins/eagenerators/jasper/Makefile.in index 0c97f48..b361514 100644 --- a/plugins/eagenerators/jasper/Makefile.in +++ b/plugins/eagenerators/jasper/Makefile.in @@ -139,6 +139,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -147,6 +149,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -202,6 +206,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -436,6 +441,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -508,6 +514,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -519,6 +526,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -598,6 +606,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/jpeg/Makefile.in b/plugins/eagenerators/jpeg/Makefile.in index 410bedd..82e4c06 100644 --- a/plugins/eagenerators/jpeg/Makefile.in +++ b/plugins/eagenerators/jpeg/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/kde3metadata/Makefile.in b/plugins/eagenerators/kde3metadata/Makefile.in index 830a082..e405626 100644 --- a/plugins/eagenerators/kde3metadata/Makefile.in +++ b/plugins/eagenerators/kde3metadata/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/libextractor/Makefile.in b/plugins/eagenerators/libextractor/Makefile.in index ab076d7..56f73c1 100644 --- a/plugins/eagenerators/libextractor/Makefile.in +++ b/plugins/eagenerators/libextractor/Makefile.in @@ -140,6 +140,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -148,6 +150,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -203,6 +207,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -437,6 +442,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -509,6 +515,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -520,6 +527,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -599,6 +607,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/libmpeg3/Makefile.in b/plugins/eagenerators/libmpeg3/Makefile.in index be3c2c6..2bdef74 100644 --- a/plugins/eagenerators/libmpeg3/Makefile.in +++ b/plugins/eagenerators/libmpeg3/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/magick/Makefile.in b/plugins/eagenerators/magick/Makefile.in index e9bb2d9..47ce295 100644 --- a/plugins/eagenerators/magick/Makefile.in +++ b/plugins/eagenerators/magick/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/mediainfo/Makefile.in b/plugins/eagenerators/mediainfo/Makefile.in index b060429..504a214 100644 --- a/plugins/eagenerators/mediainfo/Makefile.in +++ b/plugins/eagenerators/mediainfo/Makefile.in @@ -140,6 +140,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -148,6 +150,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -203,6 +207,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -437,6 +442,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -509,6 +515,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -520,6 +527,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -599,6 +607,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/mpeg2/Makefile.in b/plugins/eagenerators/mpeg2/Makefile.in index 9e2bd61..4619eef 100644 --- a/plugins/eagenerators/mpeg2/Makefile.in +++ b/plugins/eagenerators/mpeg2/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/oggz/Makefile.in b/plugins/eagenerators/oggz/Makefile.in index 8f1e4ba..ed8b8ec 100644 --- a/plugins/eagenerators/oggz/Makefile.in +++ b/plugins/eagenerators/oggz/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/png/Makefile.in b/plugins/eagenerators/png/Makefile.in index cd97757..f8d01ca 100644 --- a/plugins/eagenerators/png/Makefile.in +++ b/plugins/eagenerators/png/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/png/libferrispng.cpp b/plugins/eagenerators/png/libferrispng.cpp index aadd77f..ad96e48 100644 --- a/plugins/eagenerators/png/libferrispng.cpp +++ b/plugins/eagenerators/png/libferrispng.cpp @@ -253,7 +253,7 @@ PNG_Image::readImageMetaData( png_infop info ) if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); } if( color_type & PNG_COLOR_MASK_ALPHA ) diff --git a/plugins/eagenerators/soprano/Makefile.in b/plugins/eagenerators/soprano/Makefile.in index 46afa55..ef1e25c 100644 --- a/plugins/eagenerators/soprano/Makefile.in +++ b/plugins/eagenerators/soprano/Makefile.in @@ -158,6 +158,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -166,6 +168,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -221,6 +225,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -455,6 +460,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -527,6 +533,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -538,6 +545,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -617,6 +625,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/strigi/Makefile.in b/plugins/eagenerators/strigi/Makefile.in index bf17741..a7686b1 100644 --- a/plugins/eagenerators/strigi/Makefile.in +++ b/plugins/eagenerators/strigi/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/subtitles/Makefile.in b/plugins/eagenerators/subtitles/Makefile.in index 4b07d09..52140a3 100644 --- a/plugins/eagenerators/subtitles/Makefile.in +++ b/plugins/eagenerators/subtitles/Makefile.in @@ -136,6 +136,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -144,6 +146,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -199,6 +203,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -433,6 +438,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -505,6 +511,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -516,6 +523,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -595,6 +603,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/taglib/Makefile.in b/plugins/eagenerators/taglib/Makefile.in index 3df338a..12ece2b 100644 --- a/plugins/eagenerators/taglib/Makefile.in +++ b/plugins/eagenerators/taglib/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/xfsnative/Makefile.in b/plugins/eagenerators/xfsnative/Makefile.in index cc7cbda..0633e90 100644 --- a/plugins/eagenerators/xfsnative/Makefile.in +++ b/plugins/eagenerators/xfsnative/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/xine/Makefile.in b/plugins/eagenerators/xine/Makefile.in index 8b4c977..a5bf538 100644 --- a/plugins/eagenerators/xine/Makefile.in +++ b/plugins/eagenerators/xine/Makefile.in @@ -140,6 +140,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -148,6 +150,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -203,6 +207,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -437,6 +442,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -509,6 +515,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -520,6 +527,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -599,6 +607,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eagenerators/xmp/Makefile.in b/plugins/eagenerators/xmp/Makefile.in index 37fe0c0..270cedc 100644 --- a/plugins/eagenerators/xmp/Makefile.in +++ b/plugins/eagenerators/xmp/Makefile.in @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -146,6 +148,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -201,6 +205,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -435,6 +440,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -507,6 +513,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -518,6 +525,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -597,6 +605,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/Makefile.in b/plugins/eaindexers/Makefile.in index 5904e46..17712ce 100644 --- a/plugins/eaindexers/Makefile.in +++ b/plugins/eaindexers/Makefile.in @@ -132,6 +132,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -140,6 +142,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -195,6 +199,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -429,6 +434,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -501,6 +507,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -512,6 +519,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -591,6 +599,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/boost/Makefile.in b/plugins/eaindexers/boost/Makefile.in index 1cf1bc4..5a84c97 100644 --- a/plugins/eaindexers/boost/Makefile.in +++ b/plugins/eaindexers/boost/Makefile.in @@ -165,6 +165,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -173,6 +175,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -228,6 +232,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -462,6 +467,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -534,6 +540,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -545,6 +552,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -624,6 +632,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/clucene/Makefile.in b/plugins/eaindexers/clucene/Makefile.in index ad0c676..e196486 100644 --- a/plugins/eaindexers/clucene/Makefile.in +++ b/plugins/eaindexers/clucene/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/clucene/libeaindexclucene.cpp b/plugins/eaindexers/clucene/libeaindexclucene.cpp index 11331e8..fc223df 100644 --- a/plugins/eaindexers/clucene/libeaindexclucene.cpp +++ b/plugins/eaindexers/clucene/libeaindexclucene.cpp @@ -55,8 +55,21 @@ using namespace lucene::analysis::standard; using namespace lucene::search; using namespace lucene::queryParser; +#define URL_REGEX_WORD_LENGTH 20 + namespace Ferris { + static bool regexHasNoSpecialChars( const std::string&s ) + { + static boost::regex rex("^[a-zA-Z0-9 '\\\"]*$"); + boost::smatch matches; + if( boost::regex_match( s, matches, rex )) + { + return true; + } + return false; + } + static string padInteger( int v ) { stringstream ss; @@ -225,6 +238,16 @@ namespace Ferris } return m_writer; } + + Searcher* m_SearcherFor_isFileNewerThanIndexedVersion; + Searcher* getSearcherFor_isFileNewerThanIndexedVersion() + { + if( !m_SearcherFor_isFileNewerThanIndexedVersion ) + { + m_SearcherFor_isFileNewerThanIndexedVersion = new IndexSearcher( getPath().c_str() ); + } + return m_SearcherFor_isFileNewerThanIndexedVersion; + } protected: @@ -281,8 +304,8 @@ namespace Ferris /************************************************************/ EAIndexerCLucene::EAIndexerCLucene() - : - m_writer( 0 ) + : m_writer( 0 ) + , m_SearcherFor_isFileNewerThanIndexedVersion( 0 ) { } @@ -373,48 +396,50 @@ namespace Ferris lucene::document::Document* doc = new lucene::document::Document(); - { - l_IndexReader writer = IndexReader::open( getPath().c_str() ); - - { - stringset_t retainnames; - retainnames.insert("contents"); - retainnames.insert("ferris-ftx-modified"); - - l_Term t = newterm( "ferris-url", c->getURL() ); - l_TermQuery pq = new TermQuery( t ); - auto_ptr searcher( new IndexSearcher( getPath().c_str() ) ); - l_Hits hits = searcher->search( pq ); - LG_EAIDX_D << "Found old docid hits:" << hits->length() << endl; - if( hits->length() ) - { - lucene::document::Document& olddoc = hits->doc(0); - - LG_EAIDX_D << "has contents:" << (olddoc.get( _T("contents") )!=0) << endl; - LG_EAIDX_D << "olddoc.tostring:" << olddoc.toString() << endl; - DocumentFieldEnumeration* iter = olddoc.fields(); - while( iter->hasMoreElements() ) - { - Field* f = iter->nextElement(); - LG_EAIDX_D << "found f:" << f->name() << endl; - if( retainnames.count( (const char*)f->name() ) ) - { - LG_EAIDX_D << "Retaining f:" << f->name() << endl; - doc->add( *f ); - } - } - } - } + // { + // l_IndexReader writer = IndexReader::open( getPath().c_str() ); + + // { + // stringset_t retainnames; + // retainnames.insert("contents"); + // retainnames.insert("ferris-ftx-modified"); + + // l_Term t = newterm( "ferris-url", c->getURL() ); + // l_TermQuery pq = new TermQuery( t ); + // auto_ptr searcher( new IndexSearcher( getPath().c_str() ) ); + // l_Hits hits = searcher->search( pq ); + // LG_EAIDX_D << "Found old docid hits:" << hits->length() << endl; + // if( hits->length() ) + // { + // lucene::document::Document& olddoc = hits->doc(0); + + // LG_EAIDX_D << "has contents:" << (olddoc.get( _T("contents") )!=0) << endl; + // LG_EAIDX_D << "olddoc.tostring:" << olddoc.toString() << endl; + // DocumentFieldEnumeration* iter = olddoc.fields(); + // while( iter->hasMoreElements() ) + // { + // Field* f = iter->nextElement(); + // LG_EAIDX_D << "found f:" << f->name() << endl; + // if( retainnames.count( (const char*)f->name() ) ) + // { + // LG_EAIDX_D << "Retaining f:" << f->name() << endl; + // doc->add( *f ); + // } + // } + // } + // } - int32_t delCount = writer->deleteDocuments( - newterm( "ferris-url", c->getURL() ) ); - writer->close(); - } + // int32_t delCount = writer->deleteDocuments( + // newterm( "ferris-url", c->getURL() ) ); + // writer->close(); + // } l_IndexWriter writer = getIndexWriter(); + if( !getenv( "LIBFERRIS_INDEX_NO_REMOVE" ) ) + writer->deleteDocuments( newterm( "ferris-url", c->getURL() ) ); typedef AttributeCollection::AttributeNames_t ant; ant an; @@ -496,12 +521,42 @@ namespace Ferris add( doc, "ferris-url-cs", c->getURL() ); add( doc, "ferris-modified-cs", mtime ); + // Allow for simple regex evaulation using shifted term indexing on url + { + typedef std::set< std::string > col_t; + std::string earl = c->getURL(); + col_t sl; + Util::parseSeperatedList( earl, sl, '/' ); + col_t next; + for( int i = 0; i < URL_REGEX_WORD_LENGTH; ++i ) + { + for( col_t::iterator si = sl.begin(); si != sl.end(); ++si ) + { +// cerr << "i:" << i << " s:" << *si << endl; + std::string s = *si; + if( s.empty() ) + continue; + std::stringstream keyss; + keyss << "url" << "__prefixed";// << i; + add( doc, keyss.str(), foldcase( s )); + next.insert( s.substr(1) ); + } + std::swap( sl, next ); + } + } + LG_EAIDX_D << "addToIndex(addDoc) c:" << c->getURL() << endl; writer->addDocument( doc ); // writer->optimize(); - writer->close(); - m_writer = 0; +// writer->close(); +// m_writer = 0; + + incrFilesIndexedCount(); + if( getFilesIndexedCount() % 1000 == 999 ) + { + sync(); + } } catch (exception& e) { @@ -746,14 +801,30 @@ namespace Ferris } else if( tokenfc == "=~" ) { + bool hasNoSpecialChars = regexHasNoSpecialChars( value ); value = Util::replace_all( value, ".*", "*" ); value = Util::replace_all( value, ".", "?" ); - if( string::npos == value.find( "*" ) ) - value = (string)"*" + value + "*"; - - WildcardQuery* pq = new WildcardQuery( - makeTerm( eaname, att, value ) ); - query->add( pq, true, true, false ); + if( hasNoSpecialChars && eaname == "url" && !value.empty() ) + { + LG_EAIDX_D << "quick resolution... value:" << value << endl; + stringstream vss; + vss << value << "*"; + std::stringstream keyss; + keyss << eaname << "__prefixed";// << i; + +// cerr << "qr vss:" << vss.str() << endl; + WildcardQuery* pq = new WildcardQuery( + makeTerm( keyss.str(), att, vss.str() ) ); + query->add( pq, true, true, false ); + } + else + { + if( string::npos == value.find( "*" ) ) + value = (string)"*" + value + "*"; + WildcardQuery* pq = new WildcardQuery( + makeTerm( eaname, att, value ) ); + query->add( pq, true, true, false ); + } } else if( tokenfc == "<=" ) { @@ -827,15 +898,18 @@ namespace Ferris fh_eaquery qobj, int limit ) { - if( limit ) + try { - stringstream ss; - ss << "EAIndexerCLucene::ExecuteQuery() limit not currently supported for Lucene backend" << endl; - cerr << tostr(ss); - LG_EAIDX_I << tostr(ss); - } + + if( limit ) + { + stringstream ss; + ss << "EAIndexerCLucene::ExecuteQuery() limit not currently supported for Lucene backend" << endl; + cerr << tostr(ss); + LG_EAIDX_I << tostr(ss); + } - fh_stringstream qss; + fh_stringstream qss; // { // l_BooleanQuery query = new BooleanQuery(); @@ -864,8 +938,8 @@ namespace Ferris - LG_EAIDX_D << "ExecuteQuery() building lucene query " << endl; - l_BooleanQuery query = BuildQuery( q, output, qobj, new BooleanQuery() ); + LG_EAIDX_D << "ExecuteQuery() building lucene query " << endl; + l_BooleanQuery query = BuildQuery( q, output, qobj, new BooleanQuery() ); // BooleanQuery* query = _CLNEW BooleanQuery(); // { // // Term* t = new Term( "ferris-url", "fdff" ); @@ -876,37 +950,48 @@ namespace Ferris // query->add( pq, false, true, false ); // } - LG_EAIDX_D << "ExecuteQuery() created lucene query " << endl; + LG_EAIDX_D << "ExecuteQuery() created lucene query " << endl; // Analyzer* analyzer = newAnalyzer(); // Query* query = QueryParser::parse( tojstr( tostr( qss )), // tojstr(""), // analyzer ); - Searcher* searcher = new IndexSearcher( getPath().c_str() ); - LG_EAIDX_D << "ExecuteQuery() getting hits " << endl; - l_Hits hits = searcher->search( GetImpl(query) ); + Searcher* searcher = new IndexSearcher( getPath().c_str() ); + LG_EAIDX_D << "ExecuteQuery() getting hits " << endl; + l_Hits hits = searcher->search( GetImpl(query) ); - LG_EAIDX_D << "ExecuteQuery() adding hits " << endl; - long length = hits->length(); - LG_EAIDX_D << "ExecuteQuery() adding hits hits.Length():" << length << endl; + LG_EAIDX_D << "ExecuteQuery() adding hits " << endl; + long length = hits->length(); + LG_EAIDX_D << "ExecuteQuery() adding hits hits.Length():" << length << endl; - for (int i = 0; i < hits->length(); i++) - { - lucene::document::Document doc = hits->doc(i); - int docID = hits->id( i ); - - if( !doc.get(_T("ferris-url")) ) + for (int i = 0; i < hits->length(); i++) { - LG_EAIDX_W << "no URL recorded for id:" << docID << endl; - continue; - } + lucene::document::Document doc = hits->doc(i); + int docID = hits->id( i ); - addDocID( output, docID ); - LG_EAIDX_D << "id:" << docID << endl; - LG_EAIDX_D << "url:" << STR(doc.get(_T("ferris-url"))) << endl; - m_docIDHash[ docID ] = STR(doc.get(_T("ferris-url"))); - } + if( !doc.get(_T("ferris-url")) ) + { + LG_EAIDX_W << "no URL recorded for id:" << docID << endl; + continue; + } + + addDocID( output, docID ); + LG_EAIDX_D << "id:" << docID << endl; + LG_EAIDX_D << "url:" << STR(doc.get(_T("ferris-url"))) << endl; + m_docIDHash[ docID ] = STR(doc.get(_T("ferris-url"))); + } + return output; + } + catch( CLuceneError& e ) + { + cerr << "unexpoected error number:" << e.number() << endl; + throw; + } + catch( ... ) + { + throw; + } return output; } @@ -927,6 +1012,7 @@ namespace Ferris /****************************************/ /****************************************/ + bool EAIndexerCLucene::isFileNewerThanIndexedVersion( const fh_context& c ) { @@ -945,7 +1031,8 @@ namespace Ferris l_Term t = newterm( "ferris-url", c->getURL() ); l_TermQuery pq = new TermQuery( t ); - auto_ptr searcher( new IndexSearcher( getPath().c_str() ) ); +// auto_ptr searcher( new IndexSearcher( getPath().c_str() ) ); + Searcher* searcher = getSearcherFor_isFileNewerThanIndexedVersion(); l_Hits hits = searcher->search( pq ); LG_EAIDX_D << "isFileNewerThanIndexedVersion(T2) c:" << c->getURL() << endl; diff --git a/plugins/eaindexers/federation/Makefile.in b/plugins/eaindexers/federation/Makefile.in index cd47fea..d872b81 100644 --- a/plugins/eaindexers/federation/Makefile.in +++ b/plugins/eaindexers/federation/Makefile.in @@ -149,6 +149,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -157,6 +159,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -212,6 +216,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -446,6 +451,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -518,6 +524,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -529,6 +536,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -608,6 +616,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/ldap/Makefile.in b/plugins/eaindexers/ldap/Makefile.in index acf7abe..6f0ac42 100644 --- a/plugins/eaindexers/ldap/Makefile.in +++ b/plugins/eaindexers/ldap/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/lucene/Makefile.in b/plugins/eaindexers/lucene/Makefile.in index 8d00348..689ebf0 100644 --- a/plugins/eaindexers/lucene/Makefile.in +++ b/plugins/eaindexers/lucene/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/null/Makefile.in b/plugins/eaindexers/null/Makefile.in index a6e5e11..5d1f3d8 100644 --- a/plugins/eaindexers/null/Makefile.in +++ b/plugins/eaindexers/null/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/odbc/Makefile.in b/plugins/eaindexers/odbc/Makefile.in index e87692f..642720a 100644 --- a/plugins/eaindexers/odbc/Makefile.in +++ b/plugins/eaindexers/odbc/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/postgresql/Makefile.in b/plugins/eaindexers/postgresql/Makefile.in index b743bb8..1db28a8 100644 --- a/plugins/eaindexers/postgresql/Makefile.in +++ b/plugins/eaindexers/postgresql/Makefile.in @@ -149,6 +149,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -157,6 +159,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -212,6 +216,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -446,6 +451,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -518,6 +524,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -529,6 +536,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -608,6 +616,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/postgresql/libeaindexpostgresql.cpp b/plugins/eaindexers/postgresql/libeaindexpostgresql.cpp index 4f9ffff..e2462a7 100644 --- a/plugins/eaindexers/postgresql/libeaindexpostgresql.cpp +++ b/plugins/eaindexers/postgresql/libeaindexpostgresql.cpp @@ -1065,6 +1065,15 @@ namespace Ferris " for r in select urlid from urlmap where to_tsvector('simple',fnshiftstring(url)) @@ to_tsquery('simple', q || ':*' ) loop \n" " return next r.urlid; \n" " end loop; \n" + " elsif not caseSensitive and regexp_replace( q, '[a-zA-Z0-9]*\.[a-zA-Z0-9]*', '') = '' then \n" + " arr := regexp_split_to_array( q, '\.' );\n" + " for r in select urlid from urlmap \n" + " where to_tsvector('simple',fnshiftstring(url)) @@ to_tsquery('simple', arr[1] || ':*' ) \n" + " and to_tsvector('simple',fnshiftstring(url)) @@ to_tsquery('simple', arr[2] || ':*' ) \n" + " and url ~* q\n" + " loop \n" + " return next r.urlid; \n" + " end loop; \n" " else \n" " if eaname = 'name' then \n" " q := '.*/' || qconst || '[^/]*$'; \n" @@ -3241,7 +3250,9 @@ namespace Ferris caseSenPrefix = " lower( "; caseSenPostfix = " ) "; } - + + // allow lookup by docid + m_ExtraColumnsToInlineInDocmap["docid"] = "int"; stringmap_t::const_iterator eci = m_ExtraColumnsToInlineInDocmap.find( eaname ); m_bitfColumns_t::const_iterator bfci = m_bitfColumns.find( eaname ); @@ -3277,8 +3288,6 @@ namespace Ferris << " WHERE urlid in ( " << endl << " select urlmatch( " << q << ", '" << eaname << "', " << isCaseSen << " ) " << endl << " )" << endl; - if( getLimit() ) - sqlss << " limit " << getLimit(); sqlss << " )" << endl << endl; @@ -4238,6 +4247,7 @@ namespace Ferris { string v = ti->c_str(); row->insert( make_pair( ti->name(), v ) ); +// cerr << "precache:" << ti->name() << " -> " << v << endl; } m_cache[ earl ] = row; diff --git a/plugins/eaindexers/qtsql/Makefile.in b/plugins/eaindexers/qtsql/Makefile.in index 9c5661d..99d7222 100644 --- a/plugins/eaindexers/qtsql/Makefile.in +++ b/plugins/eaindexers/qtsql/Makefile.in @@ -142,6 +142,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -150,6 +152,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -205,6 +209,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -439,6 +444,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -511,6 +517,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -522,6 +529,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -601,6 +609,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/qtsql/libeaindexqtsql.cpp b/plugins/eaindexers/qtsql/libeaindexqtsql.cpp index b4ee26d..aa2fcb5 100644 --- a/plugins/eaindexers/qtsql/libeaindexqtsql.cpp +++ b/plugins/eaindexers/qtsql/libeaindexqtsql.cpp @@ -318,6 +318,8 @@ namespace Ferris virtual ~EAIndexerQTSQL(); virtual void sync(); + virtual void prepareForWrites( int f ); + virtual void allWritesComplete(); QSqlDatabase& getConnection(); virtual void reindexingDocument( fh_context c, docid_t docid ); @@ -373,6 +375,12 @@ namespace Ferris fh_ValueMapInt getValueMapInt(); fh_ValueMapDouble getValueMapDouble(); fh_ValueMapTime getValueMapTime(); + + virtual std::string getisFileNewerThanIndexedVersionDBTimeColumnName() + { + return "docidtime"; + } + }; @@ -412,6 +420,7 @@ namespace Ferris EAIndexerQTSQL::Setup() { QTSQLSetup(); +// cerr << "EAIndexerQTSQL::Setup()" << endl; } @@ -428,6 +437,8 @@ namespace Ferris getStrSubCtx( md, "extra-columns-to-inline-in-docmap", CFG_QTSQLIDX_EXTRA_COLUMNS_TO_INLINE_IN_DOCMAP_DEFAULT ) ); + if( m_ExtraColumnsToInlineInDocmap.end() == m_ExtraColumnsToInlineInDocmap.find("docidtime")) + m_ExtraColumnsToInlineInDocmap["docidtime"] = "timestamp"; setConfig( CFG_QTSQLIDX_EXTRA_COLUMNS_TO_INLINE_IN_DOCMAP_K, Util::CreateKeyValueString( m_ExtraColumnsToInlineInDocmap, "=", ":" ) ); @@ -463,7 +474,6 @@ namespace Ferris << " on docmap ( " << colname << " )"; extraDocmapIndexes.push_back( tostr( idxss ) ); } - extraDocmapColumns = tostr( colss ); } @@ -474,7 +484,8 @@ namespace Ferris << extraDocmapColumns << " docid INTEGER PRIMARY KEY AUTOINCREMENT " << " )"; - +// cerr << ss.str() << endl; + Execute( tostr(ss) ); } Execute( "create index docmapurlidx on docmap ( url )" ); @@ -571,6 +582,7 @@ namespace Ferris Execute( indexing_commands ); // Don't mix DML and DDL in SQL99 compliant apps. // getConnection().CommitAll(); + getConnection().commit(); // make sure the empty string is awaiting us in the lookup tables. { @@ -579,6 +591,7 @@ namespace Ferris ddl.push_back( "insert into strlookupnocase (vid,attrvalue) values (0,'') " ); Execute( ddl ); // getConnection().CommitAll(); + getConnection().commit(); } // we always have access to the URL string @@ -599,8 +612,24 @@ namespace Ferris void EAIndexerQTSQL::sync() { + m_db.commit(); + m_db.transaction(); + } + void EAIndexerQTSQL::prepareForWrites( int f ) + { + int rc = getConnection().transaction(); + cerr << "prepareForWrites() rc:" << rc << endl; + cerr << "has trans feature:" << getConnection().driver()->hasFeature(QSqlDriver::Transactions) << endl; + + } + + void EAIndexerQTSQL::allWritesComplete() + { + cerr << "allWritesComplete()" << endl; + getConnection().commit(); } + void EAIndexerQTSQL::reindexingDocument( fh_context c, docid_t docid ) { @@ -724,7 +753,7 @@ namespace Ferris LG_EAIDX_D << "EAIndexerQTSQL::addToIndex() earl:" << earl << endl; long docid = obtainDocumentID( c ); LG_EAIDX_D << "EAIndexerQTSQL::addToIndex() docid:" << docid << endl; - + typedef list< IndexableValue > ivl_t; ivl_t ivl; @@ -918,7 +947,8 @@ namespace Ferris // } // else // getConnection().CommitAll(); - getConnection().commit(); + touchdocmapdocidtime( c, docid ); +// getConnection().commit(); getAttrMap()->updateSizeCache(); getValueMapString()->updateSizeCache(); @@ -928,6 +958,12 @@ namespace Ferris getValueMapTime()->updateSizeCache(); ++m_filesIndexedCount; + + incrFilesIndexedCount(); + if( getFilesIndexedCount() % 1000 == 999 ) + { + sync(); + } } @@ -946,13 +982,15 @@ namespace Ferris stringmap_t::const_iterator eci = m_ExtraColumnsToInlineInDocmap.find( eaname ); - LG_EAIDX_D << "EAIndexerQTSQL::AddSQLOp() " - << " v:" << iv.rawValueString() - << " v.asstring:" << asString( iv, att ) - << endl; + LG_EAIDX_D << "EAIndexerQTSQL::AddSQLOp() att:" << att << " v:" << iv.rawValueString() << endl; + LG_EAIDX_D << "EAIndexerQTSQL::AddSQLOp() " << " v.asstring:" << asString( iv, att ) << endl; if( eaname == "url" ) { + att = ATTRTYPEID_CIS; + if( isCaseSensitive( iv.rawValueString())) + att = ATTRTYPEID_STR; + std::string v = asString( iv, att ); if( opcode == "like" ) { diff --git a/plugins/eaindexers/soprano/Makefile.in b/plugins/eaindexers/soprano/Makefile.in index 959e35f..1c50a33 100644 --- a/plugins/eaindexers/soprano/Makefile.in +++ b/plugins/eaindexers/soprano/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/eaindexers/xapian/Makefile.in b/plugins/eaindexers/xapian/Makefile.in index 9a57538..7a2e1c5 100644 --- a/plugins/eaindexers/xapian/Makefile.in +++ b/plugins/eaindexers/xapian/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/Makefile.in b/plugins/fulltextindexers/Makefile.in index ef02de3..b651715 100644 --- a/plugins/fulltextindexers/Makefile.in +++ b/plugins/fulltextindexers/Makefile.in @@ -132,6 +132,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -140,6 +142,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -195,6 +199,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -429,6 +434,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -501,6 +507,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -512,6 +519,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -591,6 +599,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/beagle/Makefile.in b/plugins/fulltextindexers/beagle/Makefile.in index ac30404..c3f1bde 100644 --- a/plugins/fulltextindexers/beagle/Makefile.in +++ b/plugins/fulltextindexers/beagle/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/clucene/Makefile.in b/plugins/fulltextindexers/clucene/Makefile.in index 5853ace..684d245 100644 --- a/plugins/fulltextindexers/clucene/Makefile.in +++ b/plugins/fulltextindexers/clucene/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/clucene/libftxidxclucene.cpp b/plugins/fulltextindexers/clucene/libftxidxclucene.cpp index be48d3b..2484f41 100644 --- a/plugins/fulltextindexers/clucene/libftxidxclucene.cpp +++ b/plugins/fulltextindexers/clucene/libftxidxclucene.cpp @@ -136,6 +136,9 @@ namespace FullTextIndex Analyzer* newAnalyzer(); protected: + + l_IndexWriter m_writer; + l_IndexWriter getIndexWriter(); virtual void Setup(); virtual void CreateIndexBeforeConfig( fh_context c, @@ -163,6 +166,11 @@ namespace FullTextIndex public: FullTextIndexerCLucene(); + ~FullTextIndexerCLucene(); + + virtual void sync(); + virtual void prepareForWrites( int f ); + virtual void allWritesComplete(); docNumSet_t& ExecuteLuceneFullTextQuery( const std::string& queryString, @@ -283,9 +291,66 @@ namespace FullTextIndex FullTextIndexerCLucene::FullTextIndexerCLucene() + : m_writer(0) + { + } + + FullTextIndexerCLucene::~FullTextIndexerCLucene() + { + sync(); + } + + l_IndexWriter + FullTextIndexerCLucene::getIndexWriter() + { + if( !m_writer ) + { + m_writer = new IndexWriter( getPath().c_str(), newAnalyzer(), false ); + m_writer->setMaxFieldLength( 512*1024*1024 ); +// cerr << "IndexWriter::DEFAULT_MAX_FIELD_LENGTH:" << IndexWriter::DEFAULT_MAX_FIELD_LENGTH << endl; + } + return m_writer; + } + + void + FullTextIndexerCLucene::sync() + { + try + { + if( GetImpl(m_writer) ) + { + m_writer->optimize(); + m_writer->close(); + m_writer = 0; + } + } + catch( CLuceneError& e ) + { + if( e.number() == CL_ERR_AlreadyClosed ) + { + return; + } + cerr << "unexpoected error number:" << e.number() << endl; + throw; + } + catch( ... ) + { + throw; + } + } + + void + FullTextIndexerCLucene::prepareForWrites( int f ) { } + void + FullTextIndexerCLucene::allWritesComplete() + { + sync(); + } + + void FullTextIndexerCLucene::Setup() @@ -352,20 +417,20 @@ namespace FullTextIndex lucene::document::Document* doc = new lucene::document::Document(); - // out with the old. - { - IndexModifier* writer = new IndexModifier( getPath().c_str(), newAnalyzer(), false ); - int32_t delCount = writer->deleteDocuments( newterm( "url", c->getURL() ) ); - writer->flush(); - writer->close(); - } + l_IndexWriter writer = getIndexWriter(); + if( !getenv( "LIBFERRIS_INDEX_NO_REMOVE" ) ) + writer->deleteDocuments( newterm( "ferris-url", c->getURL() ) ); + // // out with the old. + // { + // IndexModifier* writer = new IndexModifier( getPath().c_str(), newAnalyzer(), false ); + // int32_t delCount = writer->deleteDocuments( newterm( "url", c->getURL() ) ); + // writer->flush(); + // writer->close(); + // } - l_IndexWriter writer = new IndexWriter( getPath().c_str(), newAnalyzer(), false ); - writer->setMaxFieldLength( 512*1024*1024 ); -// writer->setMaxFieldLength(IndexWriter::DEFAULT_MAX_FIELD_LENGTH); - cerr << "IndexWriter::DEFAULT_MAX_FIELD_LENGTH:" << IndexWriter::DEFAULT_MAX_FIELD_LENGTH << endl; - + +// l_IndexWriter writer = new IndexWriter( getPath().c_str(), newAnalyzer(), false ); string mtime = getStrAttr( c, "mtime", "0" ); add( doc, "url", c->getURL() ); @@ -387,15 +452,17 @@ namespace FullTextIndex // cerr << "contentstr.sz:" << contentstr.size() << endl; // str.append(contentstr.c_str()); - long tweak = Field::STORE_COMPRESS + long tweak = Field::STORE_NO // STORE_COMPRESS | Field::INDEX_TOKENIZED +// | Field::TERMVECTOR_YES; | Field::TERMVECTOR_WITH_POSITIONS_OFFSETS; + add( doc, "contents", ss.str(), tweak ); } writer->addDocument( doc ); - writer->optimize(); - writer->close(); +// writer->optimize(); +// writer->close(); } std::string diff --git a/plugins/fulltextindexers/external/Makefile.in b/plugins/fulltextindexers/external/Makefile.in index aabc098..c72d8f8 100644 --- a/plugins/fulltextindexers/external/Makefile.in +++ b/plugins/fulltextindexers/external/Makefile.in @@ -150,6 +150,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -158,6 +160,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -213,6 +217,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -447,6 +452,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -519,6 +525,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -530,6 +537,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -609,6 +617,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/lucene/Makefile.in b/plugins/fulltextindexers/lucene/Makefile.in index 7aaedc7..98bd6bb 100644 --- a/plugins/fulltextindexers/lucene/Makefile.in +++ b/plugins/fulltextindexers/lucene/Makefile.in @@ -159,6 +159,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -167,6 +169,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -222,6 +226,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -456,6 +461,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -528,6 +534,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -539,6 +546,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -618,6 +626,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/null/Makefile.in b/plugins/fulltextindexers/null/Makefile.in index d4e616c..ca1cc65 100644 --- a/plugins/fulltextindexers/null/Makefile.in +++ b/plugins/fulltextindexers/null/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/odbc/Makefile.in b/plugins/fulltextindexers/odbc/Makefile.in index 0582b88..3c0a295 100644 --- a/plugins/fulltextindexers/odbc/Makefile.in +++ b/plugins/fulltextindexers/odbc/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/qtsql/Makefile.in b/plugins/fulltextindexers/qtsql/Makefile.in index 2ef3e0a..cfddf31 100644 --- a/plugins/fulltextindexers/qtsql/Makefile.in +++ b/plugins/fulltextindexers/qtsql/Makefile.in @@ -155,6 +155,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -163,6 +165,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -218,6 +222,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -452,6 +457,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -524,6 +530,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -535,6 +542,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -614,6 +622,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/qtsql/QtSQLIndexHelper_private.hh b/plugins/fulltextindexers/qtsql/QtSQLIndexHelper_private.hh index b69afa5..dee6486 100644 --- a/plugins/fulltextindexers/qtsql/QtSQLIndexHelper_private.hh +++ b/plugins/fulltextindexers/qtsql/QtSQLIndexHelper_private.hh @@ -47,6 +47,7 @@ namespace Ferris { using namespace std; + namespace Index { @@ -211,6 +212,7 @@ namespace Ferris db.setDatabaseName(dbname.c_str()); db.setUserName(user.c_str()); db.setPassword(pass.c_str()); + PWDScope _obj( this->getPath() ); bool ok = db.open(); if( !ok ) { @@ -248,6 +250,7 @@ namespace Ferris void QTSQLsync() { + cerr << "QTSQLsync()" << endl; m_db.commit(); } @@ -315,14 +318,21 @@ namespace Ferris << " (" << getDocumentMapURLColumnName() << ") values ('" << c->getURL() - << "')"; + << "');"; LG_EAIDX_D << "SQL docmap:" << tostr(insertss) << endl; - Execute( insertss ); - docid = getDocumentID( earl, urlid ); + getConnection().transaction(); + QSqlQuery query = Execute( insertss ); + LG_EAIDX_D << "LastID:" << query.lastInsertId().toInt() << endl; + LG_EAIDX_D << "err.databasetext:" << tostr(query.lastError().databaseText()) << endl; + LG_EAIDX_D << "err.drivertext :" << tostr(query.lastError().driverText())<< endl; + LG_EAIDX_D << "err.isvalid :" << tostr(query.lastError().isValid())<< endl; + docid = query.lastInsertId().toInt(); +// docid = getDocumentID( earl, urlid ); LG_EAIDX_D << "obtainDocumentID() new docid:" << docid << " urlid:" << urlid << endl; //// getConnection().CommitAll(); +////////// getConnection().commit(); } return docid; } @@ -373,9 +383,28 @@ namespace Ferris { return true; } - + + void touchdocmapdocidtime( const fh_context& c, long docid ) + { + time_t ct = getTimeAttr( c, "ferris-should-reindex-if-newer", Time::getTime() ); + stringstream sqlss; + sqlss << "update docmap " + << " set docidtime = " << ct + << " where docid = " << docid << endl; + Execute(sqlss); + } + + virtual std::string getisFileNewerThanIndexedVersionDBTimeColumnName() + { + return "mtime"; + } + virtual bool isFileNewerThanIndexedVersion( const fh_context& c ) { + const std::string dbtimecol = getisFileNewerThanIndexedVersionDBTimeColumnName(); + + LG_EAIDX_D << "isFileNewerThanIndexedVersion() c:" << c->getURL() << endl; + bool ret = true; time_t tt = Time::getTime(); @@ -384,21 +413,23 @@ namespace Ferris return ret; QSqlQuery query( m_db ); - query.prepare( "select mtime from docmap where url = :earl" ); + std::stringstream querystr; + querystr << "select " << dbtimecol << " from docmap where url = :earl"; + query.prepare( querystr.str().c_str() ); query.bindValue( ":earl", q(c->getURL()) ); query.exec(); if (query.next()) { QSqlRecord rec = query.record(); - string mtimestring = tostr(query.value(rec.indexOf("mtime")).toString()); + string mtimestring = tostr(query.value(rec.indexOf(dbtimecol.c_str())).toString()); cerr << "mtimestring:" << mtimestring << endl; time_t idxtime = 0; if( isNumber(mtimestring) ) idxtime = toType(mtimestring); else idxtime = Time::toTime(Time::ParseTimeString(mtimestring)); - cerr << "idxtime:" << idxtime << endl; - cerr << "ct:" << ct << endl; + LG_EAIDX_D << "idxtime:" << idxtime << endl; + LG_EAIDX_D << "ct:" << ct << endl; ret = idxtime < ct; } diff --git a/plugins/fulltextindexers/qtsql/libftxidxqtsql.cpp b/plugins/fulltextindexers/qtsql/libftxidxqtsql.cpp index 91c385f..fdc0203 100644 --- a/plugins/fulltextindexers/qtsql/libftxidxqtsql.cpp +++ b/plugins/fulltextindexers/qtsql/libftxidxqtsql.cpp @@ -392,7 +392,6 @@ namespace Ferris long docid = obtainDocumentID( c ); LG_IDX_D << "addToIndexDocTermsClass(got docid) c:" << c->getURL() << endl; - { stringstream sqlss; sqlss << "update docmap " diff --git a/plugins/fulltextindexers/strigi/Makefile.in b/plugins/fulltextindexers/strigi/Makefile.in index 3aa83ca..0cc9872 100644 --- a/plugins/fulltextindexers/strigi/Makefile.in +++ b/plugins/fulltextindexers/strigi/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/tsearch2/Makefile.in b/plugins/fulltextindexers/tsearch2/Makefile.in index 25e5bea..a785123 100644 --- a/plugins/fulltextindexers/tsearch2/Makefile.in +++ b/plugins/fulltextindexers/tsearch2/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/uniqsorted/Makefile.in b/plugins/fulltextindexers/uniqsorted/Makefile.in index da55818..73177e3 100644 --- a/plugins/fulltextindexers/uniqsorted/Makefile.in +++ b/plugins/fulltextindexers/uniqsorted/Makefile.in @@ -147,6 +147,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -155,6 +157,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -210,6 +214,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -444,6 +449,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -516,6 +522,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -527,6 +534,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -606,6 +614,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/xapian/Makefile.in b/plugins/fulltextindexers/xapian/Makefile.in index c37538e..fb9a549 100644 --- a/plugins/fulltextindexers/xapian/Makefile.in +++ b/plugins/fulltextindexers/xapian/Makefile.in @@ -161,6 +161,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -169,6 +171,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -224,6 +228,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -458,6 +463,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -530,6 +536,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -541,6 +548,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -620,6 +628,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/plugins/fulltextindexers/yahoo/Makefile.in b/plugins/fulltextindexers/yahoo/Makefile.in index 1c18d10..b608dda 100644 --- a/plugins/fulltextindexers/yahoo/Makefile.in +++ b/plugins/fulltextindexers/yahoo/Makefile.in @@ -146,6 +146,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -154,6 +156,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -209,6 +213,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -443,6 +448,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -515,6 +521,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -526,6 +533,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -605,6 +613,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/Makefile.in b/tests/Makefile.in index f333bbd..c1777f5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/comparetoy/Makefile.in b/tests/comparetoy/Makefile.in index 83877df..3906d4d 100644 --- a/tests/comparetoy/Makefile.in +++ b/tests/comparetoy/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/contextiostream/Makefile.in b/tests/contextiostream/Makefile.in index 81fd0d8..b95bfb5 100644 --- a/tests/contextiostream/Makefile.in +++ b/tests/contextiostream/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/contextiterator/Makefile.in b/tests/contextiterator/Makefile.in index 8346d84..144a5d3 100644 --- a/tests/contextiterator/Makefile.in +++ b/tests/contextiterator/Makefile.in @@ -161,6 +161,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -169,6 +171,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -224,6 +228,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -458,6 +463,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -530,6 +536,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -541,6 +548,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -620,6 +628,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/extoy/Makefile.in b/tests/extoy/Makefile.in index 80c788a..c65e2f8 100644 --- a/tests/extoy/Makefile.in +++ b/tests/extoy/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/hiddensymbols/Makefile.in b/tests/hiddensymbols/Makefile.in index 9401891..2934de1 100644 --- a/tests/hiddensymbols/Makefile.in +++ b/tests/hiddensymbols/Makefile.in @@ -174,6 +174,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -182,6 +184,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -237,6 +241,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -471,6 +476,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -543,6 +549,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -554,6 +561,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -633,6 +641,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/ipc/Makefile.in b/tests/ipc/Makefile.in index c81a8fe..b19d58a 100644 --- a/tests/ipc/Makefile.in +++ b/tests/ipc/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/ipc/semaphores/Makefile.in b/tests/ipc/semaphores/Makefile.in index b0af9e8..f3727d4 100644 --- a/tests/ipc/semaphores/Makefile.in +++ b/tests/ipc/semaphores/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/ipc/shm/Makefile.in b/tests/ipc/shm/Makefile.in index cd4d41c..281cbbe 100644 --- a/tests/ipc/shm/Makefile.in +++ b/tests/ipc/shm/Makefile.in @@ -160,6 +160,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -168,6 +170,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -223,6 +227,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -457,6 +462,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -529,6 +535,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -540,6 +547,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -619,6 +627,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/links/Makefile.in b/tests/links/Makefile.in index b808a43..aab6314 100644 --- a/tests/links/Makefile.in +++ b/tests/links/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/logging/Makefile.in b/tests/logging/Makefile.in index cc7c397..42468dd 100644 --- a/tests/logging/Makefile.in +++ b/tests/logging/Makefile.in @@ -121,6 +121,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -129,6 +131,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -184,6 +188,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -418,6 +423,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -490,6 +496,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -501,6 +508,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -580,6 +588,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/lucene/Makefile.in b/tests/lucene/Makefile.in index 3769671..6a38f0d 100644 --- a/tests/lucene/Makefile.in +++ b/tests/lucene/Makefile.in @@ -125,6 +125,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -133,6 +135,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -188,6 +192,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -422,6 +427,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -494,6 +500,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -505,6 +512,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -584,6 +592,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/medallions/Makefile.in b/tests/medallions/Makefile.in index 033de61..6bbfdb6 100644 --- a/tests/medallions/Makefile.in +++ b/tests/medallions/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/medallions/simpleroot/Makefile.in b/tests/medallions/simpleroot/Makefile.in index 5ca5069..b792dfa 100644 --- a/tests/medallions/simpleroot/Makefile.in +++ b/tests/medallions/simpleroot/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/memorymanage/Makefile.in b/tests/memorymanage/Makefile.in index 95e96e7..4ef4e6c 100644 --- a/tests/memorymanage/Makefile.in +++ b/tests/memorymanage/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/memorymanage/cleanuptest/Makefile.in b/tests/memorymanage/cleanuptest/Makefile.in index 80d8133..3dc4dea 100644 --- a/tests/memorymanage/cleanuptest/Makefile.in +++ b/tests/memorymanage/cleanuptest/Makefile.in @@ -151,6 +151,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -159,6 +161,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -214,6 +218,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -448,6 +453,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -520,6 +526,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -531,6 +538,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -610,6 +618,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/quoting/Makefile.in b/tests/quoting/Makefile.in index dc39f64..2db6011 100644 --- a/tests/quoting/Makefile.in +++ b/tests/quoting/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/rdf/Makefile.in b/tests/rdf/Makefile.in index 3699b93..467210d 100644 --- a/tests/rdf/Makefile.in +++ b/tests/rdf/Makefile.in @@ -170,6 +170,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -178,6 +180,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -233,6 +237,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -467,6 +472,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -539,6 +545,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -550,6 +557,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -629,6 +637,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/regression/Makefile.in b/tests/regression/Makefile.in index 6b66520..602d06a 100644 --- a/tests/regression/Makefile.in +++ b/tests/regression/Makefile.in @@ -220,6 +220,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -228,6 +230,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -283,6 +287,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -517,6 +522,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -589,6 +595,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -600,6 +607,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -679,6 +687,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/regression/relativePaths/Makefile.in b/tests/regression/relativePaths/Makefile.in index af977a7..c1d73dc 100644 --- a/tests/regression/relativePaths/Makefile.in +++ b/tests/regression/relativePaths/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/regression/timber/Makefile.in b/tests/regression/timber/Makefile.in index b272b43..2226d91 100644 --- a/tests/regression/timber/Makefile.in +++ b/tests/regression/timber/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/runner/Makefile.in b/tests/runner/Makefile.in index 0e4781a..6655c8b 100644 --- a/tests/runner/Makefile.in +++ b/tests/runner/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sigtoy/Makefile.in b/tests/sigtoy/Makefile.in index 62b0a38..c19b5c5 100644 --- a/tests/sigtoy/Makefile.in +++ b/tests/sigtoy/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/Makefile.in b/tests/sockets/Makefile.in index f886df0..f908a41 100644 --- a/tests/sockets/Makefile.in +++ b/tests/sockets/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/daytime/Makefile.in b/tests/sockets/daytime/Makefile.in index 905798f..bf20165 100644 --- a/tests/sockets/daytime/Makefile.in +++ b/tests/sockets/daytime/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/echo/Makefile.in b/tests/sockets/echo/Makefile.in index 124f39e..6b80d24 100644 --- a/tests/sockets/echo/Makefile.in +++ b/tests/sockets/echo/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/echoclienttls/Makefile.in b/tests/sockets/echoclienttls/Makefile.in index 6c7fdb4..b9a9410 100644 --- a/tests/sockets/echoclienttls/Makefile.in +++ b/tests/sockets/echoclienttls/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/echoserver/Makefile.in b/tests/sockets/echoserver/Makefile.in index 5a412a1..fd07f6f 100644 --- a/tests/sockets/echoserver/Makefile.in +++ b/tests/sockets/echoserver/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/echoservertls/Makefile.in b/tests/sockets/echoservertls/Makefile.in index f4f3bda..8100531 100644 --- a/tests/sockets/echoservertls/Makefile.in +++ b/tests/sockets/echoservertls/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sockets/socketops/Makefile.in b/tests/sockets/socketops/Makefile.in index 89779a6..f862797 100644 --- a/tests/sockets/socketops/Makefile.in +++ b/tests/sockets/socketops/Makefile.in @@ -116,6 +116,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -124,6 +126,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -179,6 +183,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -413,6 +418,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -485,6 +491,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -496,6 +503,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -575,6 +583,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sqlplus/Makefile.in b/tests/sqlplus/Makefile.in index 977f394..bdba89c 100644 --- a/tests/sqlplus/Makefile.in +++ b/tests/sqlplus/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/sqlplus/simplequery/Makefile.in b/tests/sqlplus/simplequery/Makefile.in index 7304a40..a0621e5 100644 --- a/tests/sqlplus/simplequery/Makefile.in +++ b/tests/sqlplus/simplequery/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/streams/Makefile.in b/tests/streams/Makefile.in index 5662143..e959f5a 100644 --- a/tests/streams/Makefile.in +++ b/tests/streams/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/streams/ostream_modifiers/Makefile.in b/tests/streams/ostream_modifiers/Makefile.in index 88cbf22..b340bd3 100644 --- a/tests/streams/ostream_modifiers/Makefile.in +++ b/tests/streams/ostream_modifiers/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/streams/performance/Makefile.in b/tests/streams/performance/Makefile.in index 6ce8cd5..e8b0977 100644 --- a/tests/streams/performance/Makefile.in +++ b/tests/streams/performance/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/stringtrimming/Makefile.in b/tests/stringtrimming/Makefile.in index 1688162..fba6a69 100644 --- a/tests/stringtrimming/Makefile.in +++ b/tests/stringtrimming/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/timeparsing/Makefile.in b/tests/timeparsing/Makefile.in index 58bdd07..68e1630 100644 --- a/tests/timeparsing/Makefile.in +++ b/tests/timeparsing/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in index 6c3961f..8bbdc6a 100644 --- a/tests/touch/Makefile.in +++ b/tests/touch/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/trivial/Makefile.in b/tests/trivial/Makefile.in index b09b7af..10afcfa 100644 --- a/tests/trivial/Makefile.in +++ b/tests/trivial/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/xml/Makefile.in b/tests/xml/Makefile.in index 777e36b..34b5958 100644 --- a/tests/xml/Makefile.in +++ b/tests/xml/Makefile.in @@ -131,6 +131,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -139,6 +141,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -194,6 +198,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -428,6 +433,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -500,6 +506,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -511,6 +518,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -590,6 +598,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tests/xml/testMakeDOM/Makefile.in b/tests/xml/testMakeDOM/Makefile.in index 086e0af..67a0c27 100644 --- a/tests/xml/testMakeDOM/Makefile.in +++ b/tests/xml/testMakeDOM/Makefile.in @@ -115,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -123,6 +125,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -178,6 +182,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -412,6 +417,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -484,6 +490,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -495,6 +502,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -574,6 +582,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/xsltfunctions/Makefile.in b/xsltfunctions/Makefile.in index 162d377..6c828fb 100644 --- a/xsltfunctions/Makefile.in +++ b/xsltfunctions/Makefile.in @@ -160,6 +160,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CTXFACEBOOKDIR = @CTXFACEBOOKDIR@ CTXFACEBOOK_LA = @CTXFACEBOOK_LA@ +CTXFERRISRESTDIR = @CTXFERRISRESTDIR@ +CTXFERRISREST_LA = @CTXFERRISREST_LA@ CTXGOOGLEDIR = @CTXGOOGLEDIR@ CTXGOOGLE_LA = @CTXGOOGLE_LA@ CTXGSTREAMERDIR = @CTXGSTREAMERDIR@ @@ -168,6 +170,8 @@ CTXIDENTICADIR = @CTXIDENTICADIR@ CTXIDENTICA_LA = @CTXIDENTICA_LA@ CTXVIMEODIR = @CTXVIMEODIR@ CTXVIMEO_LA = @CTXVIMEO_LA@ +CTXZONEMINDERDIR = @CTXZONEMINDERDIR@ +CTXZONEMINDER_LA = @CTXZONEMINDER_LA@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ CUSTOMALLOC_LA = @CUSTOMALLOC_LA@ @@ -223,6 +227,7 @@ EXEEXT = @EXEEXT@ FAMPP2_CFLAGS = @FAMPP2_CFLAGS@ FAMPP2_LIBS = @FAMPP2_LIBS@ FERRISGCJ_LA = @FERRISGCJ_LA@ +FERRISRESTCTXMODDIR = @FERRISRESTCTXMODDIR@ FERRIS_AS_TEXT_PLUGIN_DIR = @FERRIS_AS_TEXT_PLUGIN_DIR@ FERRIS_CREATION_PLUGIN_DIR = @FERRIS_CREATION_PLUGIN_DIR@ FERRIS_IOSIZE = @FERRIS_IOSIZE@ @@ -457,6 +462,7 @@ MEDIAINFO_CFLAGS = @MEDIAINFO_CFLAGS@ MEDIAINFO_LIBS = @MEDIAINFO_LIBS@ MIMETYPE_DIRECTORY = @MIMETYPE_DIRECTORY@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ NEPOMUK_CFLAGS = @NEPOMUK_CFLAGS@ @@ -529,6 +535,7 @@ SANE_LIBS = @SANE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHAREDDTL_LA = @SHAREDDTL_LA@ +SHAREDFERRISRESTCTX_LA = @SHAREDFERRISRESTCTX_LA@ SHAREDLDAP_LA = @SHAREDLDAP_LA@ SHAREDOBBY_LA = @SHAREDOBBY_LA@ SHAREDPASTEBIN_LA = @SHAREDPASTEBIN_LA@ @@ -540,6 +547,7 @@ SHAREDWEBPHOTOS_LA = @SHAREDWEBPHOTOS_LA@ SHAREDWIKI_LA = @SHAREDWIKI_LA@ SHAREDXAPIANEA_LA = @SHAREDXAPIANEA_LA@ SHAREDXAPIANMODDIR = @SHAREDXAPIANMODDIR@ +SHAREDZMCTX_LA = @SHAREDZMCTX_LA@ SHELL = @SHELL@ SIGC_CFLAGS = @SIGC_CFLAGS@ SIGC_LIBS = @SIGC_LIBS@ @@ -619,6 +627,7 @@ XSD_SCHEMA = @XSD_SCHEMA@ XSD_UNKNOWN = @XSD_UNKNOWN@ XSLTFS_MOUNT_CFLAGS = @XSLTFS_MOUNT_CFLAGS@ XSLTFS_MOUNT_LIBS = @XSLTFS_MOUNT_LIBS@ +ZMCTXMODDIR = @ZMCTXMODDIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@