use all directories in js/ when build package list

2012-09-30 13:46:29 +02:00 · 2012-09-30 13:46:29 +02:00 · 74defa8d84
parent 0e6acc4b7a
commit 74defa8d84
7 changed files with 386 additions and 234 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -368,7 +368,9 @@ ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 lib_libarango_a_AR = $(AR) $(ARFLAGS)
 lib_libarango_a_LIBADD =
 am__lib_libarango_a_SOURCES_DIST = lib/Basics/ConditionLocker.cpp \
@ -797,18 +799,6 @@ bin_zclient_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_bin_zserver_OBJECTS = PerfTests/bin_zserver-zserver.$(OBJEXT)
 bin_zserver_OBJECTS = $(am_bin_zserver_OBJECTS)
 bin_zserver_DEPENDENCIES = $(am__DEPENDENCIES_2)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -I$(top_builddir)/lib/BasicsC
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@ -816,32 +806,30 @@ am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
 SOURCES = $(lib_libarango_a_SOURCES) $(lib_libarango_client_a_SOURCES) \
 	$(lib_libarango_fe_a_SOURCES) $(lib_libarango_mruby_a_SOURCES) \
 	$(lib_libarango_v8_a_SOURCES) \
@ -2850,51 +2838,261 @@ bin/zserver$(EXEEXT): $(bin_zserver_OBJECTS) $(bin_zserver_DEPENDENCIES) $(EXTRA

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f PerfTests/*.$(OBJEXT)
-	-rm -f UnitTests/*.$(OBJEXT)
-	-rm -f UnitTests/Cambridge/*.$(OBJEXT)
-	-rm -f UnitTests/Jutland/*.$(OBJEXT)
-	-rm -f UnitTests/Philadelphia/*.$(OBJEXT)
-	-rm -f arangod/Actions/*.$(OBJEXT)
-	-rm -f arangod/Ahuacatl/*.$(OBJEXT)
-	-rm -f arangod/BitIndexes/*.$(OBJEXT)
-	-rm -f arangod/GeoIndex/*.$(OBJEXT)
-	-rm -f arangod/HashIndex/*.$(OBJEXT)
-	-rm -f arangod/IndexIterators/*.$(OBJEXT)
-	-rm -f arangod/IndexOperators/*.$(OBJEXT)
-	-rm -f arangod/MRServer/*.$(OBJEXT)
-	-rm -f arangod/PriorityQueue/*.$(OBJEXT)
-	-rm -f arangod/RestHandler/*.$(OBJEXT)
-	-rm -f arangod/RestServer/*.$(OBJEXT)
-	-rm -f arangod/SkipLists/*.$(OBJEXT)
-	-rm -f arangod/V8Server/*.$(OBJEXT)
-	-rm -f arangod/VocBase/*.$(OBJEXT)
-	-rm -f arangoirb/MRClient/*.$(OBJEXT)
-	-rm -f arangosh/V8Client/*.$(OBJEXT)
-	-rm -f lib/Admin/*.$(OBJEXT)
-	-rm -f lib/ApplicationServer/*.$(OBJEXT)
-	-rm -f lib/Basics/*.$(OBJEXT)
-	-rm -f lib/BasicsC/*.$(OBJEXT)
-	-rm -f lib/Dispatcher/*.$(OBJEXT)
-	-rm -f lib/GeneralServer/*.$(OBJEXT)
-	-rm -f lib/HttpServer/*.$(OBJEXT)
-	-rm -f lib/HttpsServer/*.$(OBJEXT)
-	-rm -f lib/JsonParser/*.$(OBJEXT)
-	-rm -f lib/JsonParserX/*.$(OBJEXT)
-	-rm -f lib/Logger/*.$(OBJEXT)
-	-rm -f lib/MRuby/*.$(OBJEXT)
-	-rm -f lib/ProgramOptions/*.$(OBJEXT)
-	-rm -f lib/ProtocolBuffers/*.$(OBJEXT)
-	-rm -f lib/Rest/*.$(OBJEXT)
-	-rm -f lib/ResultGenerator/*.$(OBJEXT)
-	-rm -f lib/Scheduler/*.$(OBJEXT)
-	-rm -f lib/ShapedJson/*.$(OBJEXT)
-	-rm -f lib/SimpleHttpClient/*.$(OBJEXT)
-	-rm -f lib/UserManager/*.$(OBJEXT)
-	-rm -f lib/Utilities/*.$(OBJEXT)
-	-rm -f lib/V8/*.$(OBJEXT)
-	-rm -f lib/Variant/*.$(OBJEXT)
-	-rm -f lib/ZeroMQ/*.$(OBJEXT)
+	-rm -f PerfTests/bin_zclient-zclient.$(OBJEXT)
+	-rm -f PerfTests/bin_zserver-zserver.$(OBJEXT)
+	-rm -f UnitTests/Cambridge/UnitTests_geo_suite-Runner.$(OBJEXT)
+	-rm -f UnitTests/Cambridge/UnitTests_geo_suite-georeg.$(OBJEXT)
+	-rm -f UnitTests/Jutland/StringBufferTest.$(OBJEXT)
+	-rm -f UnitTests/Jutland/StringUtilsTest.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/associative-pointer-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/hashes-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/json-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/json-utilities-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/string-buffer-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/string-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/string-utf8-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/vector-pointer-test.$(OBJEXT)
+	-rm -f UnitTests/Philadelphia/vector-test.$(OBJEXT)
+	-rm -f UnitTests/Runner.$(OBJEXT)
+	-rm -f arangod/Actions/bin_arangod-ActionDispatcherThread.$(OBJEXT)
+	-rm -f arangod/Actions/bin_arangod-RestActionHandler.$(OBJEXT)
+	-rm -f arangod/Actions/bin_arangod-actions.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-access-optimiser.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-ast-node.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-bind-parameter.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-codegen.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-collections.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-context.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-conversions.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-error.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-explain.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-functions.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-grammar.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-index.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-node.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-optimiser.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-parser-functions.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-parser.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-result.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-scope.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-statement-dump.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-statement-walker.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-statementlist.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-tokens.$(OBJEXT)
+	-rm -f arangod/Ahuacatl/bin_arangod-ahuacatl-variable.$(OBJEXT)
+	-rm -f arangod/BitIndexes/bin_arangod-bitarray.$(OBJEXT)
+	-rm -f arangod/BitIndexes/bin_arangod-bitarrayIndex.$(OBJEXT)
+	-rm -f arangod/GeoIndex/UnitTests_geo_suite-GeoIndex.$(OBJEXT)
+	-rm -f arangod/GeoIndex/bin_arangod-GeoIndex.$(OBJEXT)
+	-rm -f arangod/HashIndex/bin_arangod-hasharray.$(OBJEXT)
+	-rm -f arangod/HashIndex/bin_arangod-hashindex.$(OBJEXT)
+	-rm -f arangod/IndexIterators/bin_arangod-index-iterator.$(OBJEXT)
+	-rm -f arangod/IndexOperators/bin_arangod-index-operator.$(OBJEXT)
+	-rm -f arangod/MRServer/bin_arangod-ApplicationMR.$(OBJEXT)
+	-rm -f arangod/MRServer/bin_arangod-mr-actions.$(OBJEXT)
+	-rm -f arangod/PriorityQueue/bin_arangod-pqueueindex.$(OBJEXT)
+	-rm -f arangod/PriorityQueue/bin_arangod-priorityqueue.$(OBJEXT)
+	-rm -f arangod/RestHandler/bin_arangod-RestBatchHandler.$(OBJEXT)
+	-rm -f arangod/RestHandler/bin_arangod-RestDocumentHandler.$(OBJEXT)
+	-rm -f arangod/RestHandler/bin_arangod-RestEdgeHandler.$(OBJEXT)
+	-rm -f arangod/RestHandler/bin_arangod-RestImportHandler.$(OBJEXT)
+	-rm -f arangod/RestHandler/bin_arangod-RestVocbaseBaseHandler.$(OBJEXT)
+	-rm -f arangod/RestServer/bin_arangod-ArangoHttpServer.$(OBJEXT)
+	-rm -f arangod/RestServer/bin_arangod-ArangoServer.$(OBJEXT)
+	-rm -f arangod/RestServer/bin_arangod-arango.$(OBJEXT)
+	-rm -f arangod/SkipLists/bin_arangod-skiplist.$(OBJEXT)
+	-rm -f arangod/SkipLists/bin_arangod-skiplistIndex.$(OBJEXT)
+	-rm -f arangod/V8Server/bin_arangod-ApplicationV8.$(OBJEXT)
+	-rm -f arangod/V8Server/bin_arangod-v8-actions.$(OBJEXT)
+	-rm -f arangod/V8Server/bin_arangod-v8-objects.$(OBJEXT)
+	-rm -f arangod/V8Server/bin_arangod-v8-query.$(OBJEXT)
+	-rm -f arangod/V8Server/bin_arangod-v8-vocbase.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-auth.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-barrier.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-blob-collection.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-collection.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-compactor.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-datafile.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-document-collection.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-general-cursor.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-headers.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-index.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-shadow-data.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-simple-collection.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-synchroniser.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-voc-shaper.$(OBJEXT)
+	-rm -f arangod/VocBase/bin_arangod-vocbase.$(OBJEXT)
+	-rm -f arangoirb/MRClient/bin_arangoirb-MRubyClientConnection.$(OBJEXT)
+	-rm -f arangoirb/MRClient/bin_arangoirb-arangoirb.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangoimp-ImportHelper.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangoimp-V8ClientConnection.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangoimp-arangoimp.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangosh-ImportHelper.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangosh-V8ClientConnection.$(OBJEXT)
+	-rm -f arangosh/V8Client/bin_arangosh-arangosh.$(OBJEXT)
+	-rm -f lib/Admin/ApplicationAdminServer.$(OBJEXT)
+	-rm -f lib/Admin/RestAdminBaseHandler.$(OBJEXT)
+	-rm -f lib/Admin/RestAdminFeConfigurationHandler.$(OBJEXT)
+	-rm -f lib/Admin/RestAdminLogHandler.$(OBJEXT)
+	-rm -f lib/Admin/RestBaseHandler.$(OBJEXT)
+	-rm -f lib/Admin/RestVersionHandler.$(OBJEXT)
+	-rm -f lib/ApplicationServer/ApplicationFeature.$(OBJEXT)
+	-rm -f lib/ApplicationServer/ApplicationServer.$(OBJEXT)
+	-rm -f lib/Basics/ConditionLocker.$(OBJEXT)
+	-rm -f lib/Basics/ConditionVariable.$(OBJEXT)
+	-rm -f lib/Basics/FileUtils.$(OBJEXT)
+	-rm -f lib/Basics/Initialise.$(OBJEXT)
+	-rm -f lib/Basics/LibraryLoader.$(OBJEXT)
+	-rm -f lib/Basics/Mutex.$(OBJEXT)
+	-rm -f lib/Basics/MutexLocker.$(OBJEXT)
+	-rm -f lib/Basics/ProgramOptions.$(OBJEXT)
+	-rm -f lib/Basics/ProgramOptionsDescription.$(OBJEXT)
+	-rm -f lib/Basics/Random.$(OBJEXT)
+	-rm -f lib/Basics/ReadLocker.$(OBJEXT)
+	-rm -f lib/Basics/ReadUnlocker.$(OBJEXT)
+	-rm -f lib/Basics/ReadWriteLock.$(OBJEXT)
+	-rm -f lib/Basics/StringUtils.$(OBJEXT)
+	-rm -f lib/Basics/Thread.$(OBJEXT)
+	-rm -f lib/Basics/Timing.$(OBJEXT)
+	-rm -f lib/Basics/WriteLocker.$(OBJEXT)
+	-rm -f lib/Basics/WriteUnlocker.$(OBJEXT)
+	-rm -f lib/BasicsC/associative-multi.$(OBJEXT)
+	-rm -f lib/BasicsC/associative.$(OBJEXT)
+	-rm -f lib/BasicsC/conversions.$(OBJEXT)
+	-rm -f lib/BasicsC/csv.$(OBJEXT)
+	-rm -f lib/BasicsC/error.$(OBJEXT)
+	-rm -f lib/BasicsC/files.$(OBJEXT)
+	-rm -f lib/BasicsC/hashes.$(OBJEXT)
+	-rm -f lib/BasicsC/init.$(OBJEXT)
+	-rm -f lib/BasicsC/json-utilities.$(OBJEXT)
+	-rm -f lib/BasicsC/json.$(OBJEXT)
+	-rm -f lib/BasicsC/linked-list.$(OBJEXT)
+	-rm -f lib/BasicsC/locks-macos.$(OBJEXT)
+	-rm -f lib/BasicsC/locks-posix.$(OBJEXT)
+	-rm -f lib/BasicsC/logging.$(OBJEXT)
+	-rm -f lib/BasicsC/memory.$(OBJEXT)
+	-rm -f lib/BasicsC/process-utils.$(OBJEXT)
+	-rm -f lib/BasicsC/random.$(OBJEXT)
+	-rm -f lib/BasicsC/socket-utils.$(OBJEXT)
+	-rm -f lib/BasicsC/string-buffer.$(OBJEXT)
+	-rm -f lib/BasicsC/strings.$(OBJEXT)
+	-rm -f lib/BasicsC/structures.$(OBJEXT)
+	-rm -f lib/BasicsC/system-functions.$(OBJEXT)
+	-rm -f lib/BasicsC/terminal-utils-ncurses.$(OBJEXT)
+	-rm -f lib/BasicsC/terminal-utils.$(OBJEXT)
+	-rm -f lib/BasicsC/threads-posix.$(OBJEXT)
+	-rm -f lib/BasicsC/vector.$(OBJEXT)
+	-rm -f lib/BasicsC/voc-errors.$(OBJEXT)
+	-rm -f lib/Dispatcher/ApplicationDispatcher.$(OBJEXT)
+	-rm -f lib/Dispatcher/Dispatcher.$(OBJEXT)
+	-rm -f lib/Dispatcher/DispatcherQueue.$(OBJEXT)
+	-rm -f lib/Dispatcher/DispatcherThread.$(OBJEXT)
+	-rm -f lib/Dispatcher/Job.$(OBJEXT)
+	-rm -f lib/GeneralServer/GeneralFigures.$(OBJEXT)
+	-rm -f lib/HttpServer/ApplicationHttpServer.$(OBJEXT)
+	-rm -f lib/HttpServer/HttpCommTask.$(OBJEXT)
+	-rm -f lib/HttpServer/HttpHandler.$(OBJEXT)
+	-rm -f lib/HttpServer/HttpHandlerFactory.$(OBJEXT)
+	-rm -f lib/HttpServer/HttpServer.$(OBJEXT)
+	-rm -f lib/HttpServer/PathHandler.$(OBJEXT)
+	-rm -f lib/HttpServer/RedirectHandler.$(OBJEXT)
+	-rm -f lib/HttpServer/ServiceUnavailableHandler.$(OBJEXT)
+	-rm -f lib/HttpsServer/ApplicationHttpsServer.$(OBJEXT)
+	-rm -f lib/HttpsServer/HttpsAsyncCommTask.$(OBJEXT)
+	-rm -f lib/HttpsServer/HttpsServer.$(OBJEXT)
+	-rm -f lib/JsonParser/json-parser.$(OBJEXT)
+	-rm -f lib/JsonParserX/InputParser.$(OBJEXT)
+	-rm -f lib/JsonParserX/JsonParserX.$(OBJEXT)
+	-rm -f lib/JsonParserX/JsonParserXDriver.$(OBJEXT)
+	-rm -f lib/JsonParserX/JsonScannerX.$(OBJEXT)
+	-rm -f lib/Logger/Logger.$(OBJEXT)
+	-rm -f lib/Logger/LoggerData.$(OBJEXT)
+	-rm -f lib/Logger/LoggerInfo.$(OBJEXT)
+	-rm -f lib/Logger/LoggerStream.$(OBJEXT)
+	-rm -f lib/Logger/LoggerTiming.$(OBJEXT)
+	-rm -f lib/MRuby/MRLineEditor.$(OBJEXT)
+	-rm -f lib/MRuby/MRLoader.$(OBJEXT)
+	-rm -f lib/MRuby/mr-utils.$(OBJEXT)
+	-rm -f lib/ProgramOptions/program-options.$(OBJEXT)
+	-rm -f lib/ProtocolBuffers/HttpRequestProtobuf.$(OBJEXT)
+	-rm -f lib/ProtocolBuffers/arangodb.pb.$(OBJEXT)
+	-rm -f lib/ProtocolBuffers/bin_zclient-arangodb.pb.$(OBJEXT)
+	-rm -f lib/Rest/AddressPort.$(OBJEXT)
+	-rm -f lib/Rest/AnyServer.$(OBJEXT)
+	-rm -f lib/Rest/HttpRequest.$(OBJEXT)
+	-rm -f lib/Rest/HttpRequestPlain.$(OBJEXT)
+	-rm -f lib/Rest/HttpResponse.$(OBJEXT)
+	-rm -f lib/Rest/Initialise.$(OBJEXT)
+	-rm -f lib/Rest/JsonContainer.$(OBJEXT)
+	-rm -f lib/Rest/SslInterface.$(OBJEXT)
+	-rm -f lib/Rest/Url.$(OBJEXT)
+	-rm -f lib/ResultGenerator/HtmlResultGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/Initialise.$(OBJEXT)
+	-rm -f lib/ResultGenerator/JsonResultGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/JsonXResultGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/OutputGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/PhpResultGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/ResultGenerator.$(OBJEXT)
+	-rm -f lib/ResultGenerator/XmlResultGenerator.$(OBJEXT)
+	-rm -f lib/Scheduler/ApplicationScheduler.$(OBJEXT)
+	-rm -f lib/Scheduler/AsyncTask.$(OBJEXT)
+	-rm -f lib/Scheduler/ConnectionTask.$(OBJEXT)
+	-rm -f lib/Scheduler/ListenTask.$(OBJEXT)
+	-rm -f lib/Scheduler/PeriodicTask.$(OBJEXT)
+	-rm -f lib/Scheduler/Scheduler.$(OBJEXT)
+	-rm -f lib/Scheduler/SchedulerLibev.$(OBJEXT)
+	-rm -f lib/Scheduler/SchedulerThread.$(OBJEXT)
+	-rm -f lib/Scheduler/SignalTask.$(OBJEXT)
+	-rm -f lib/Scheduler/SocketTask.$(OBJEXT)
+	-rm -f lib/Scheduler/Task.$(OBJEXT)
+	-rm -f lib/Scheduler/TaskManager.$(OBJEXT)
+	-rm -f lib/Scheduler/TimerTask.$(OBJEXT)
+	-rm -f lib/ShapedJson/json-shaper.$(OBJEXT)
+	-rm -f lib/ShapedJson/shape-accessor.$(OBJEXT)
+	-rm -f lib/ShapedJson/shaped-json.$(OBJEXT)
+	-rm -f lib/SimpleHttpClient/SimpleHttpClient.$(OBJEXT)
+	-rm -f lib/SimpleHttpClient/SimpleHttpResult.$(OBJEXT)
+	-rm -f lib/UserManager/ApplicationUserManager.$(OBJEXT)
+	-rm -f lib/UserManager/Role.$(OBJEXT)
+	-rm -f lib/UserManager/Session.$(OBJEXT)
+	-rm -f lib/UserManager/SessionHandler.$(OBJEXT)
+	-rm -f lib/UserManager/User.$(OBJEXT)
+	-rm -f lib/UserManager/UserHandler.$(OBJEXT)
+	-rm -f lib/UserManager/UsersHandler.$(OBJEXT)
+	-rm -f lib/Utilities/LineEditor.$(OBJEXT)
+	-rm -f lib/Utilities/ScriptLoader.$(OBJEXT)
+	-rm -f lib/V8/JSLoader.$(OBJEXT)
+	-rm -f lib/V8/V8LineEditor.$(OBJEXT)
+	-rm -f lib/V8/v8-conv.$(OBJEXT)
+	-rm -f lib/V8/v8-execution.$(OBJEXT)
+	-rm -f lib/V8/v8-json.$(OBJEXT)
+	-rm -f lib/V8/v8-shell.$(OBJEXT)
+	-rm -f lib/V8/v8-utils.$(OBJEXT)
+	-rm -f lib/Variant/VariantArray.$(OBJEXT)
+	-rm -f lib/Variant/VariantBlob.$(OBJEXT)
+	-rm -f lib/Variant/VariantBoolean.$(OBJEXT)
+	-rm -f lib/Variant/VariantDate.$(OBJEXT)
+	-rm -f lib/Variant/VariantDatetime.$(OBJEXT)
+	-rm -f lib/Variant/VariantDouble.$(OBJEXT)
+	-rm -f lib/Variant/VariantFloat.$(OBJEXT)
+	-rm -f lib/Variant/VariantInt16.$(OBJEXT)
+	-rm -f lib/Variant/VariantInt32.$(OBJEXT)
+	-rm -f lib/Variant/VariantInt64.$(OBJEXT)
+	-rm -f lib/Variant/VariantInt8.$(OBJEXT)
+	-rm -f lib/Variant/VariantMatrix2.$(OBJEXT)
+	-rm -f lib/Variant/VariantNull.$(OBJEXT)
+	-rm -f lib/Variant/VariantObject.$(OBJEXT)
+	-rm -f lib/Variant/VariantString.$(OBJEXT)
+	-rm -f lib/Variant/VariantUInt16.$(OBJEXT)
+	-rm -f lib/Variant/VariantUInt32.$(OBJEXT)
+	-rm -f lib/Variant/VariantUInt64.$(OBJEXT)
+	-rm -f lib/Variant/VariantUInt8.$(OBJEXT)
+	-rm -f lib/Variant/VariantVector.$(OBJEXT)
+	-rm -f lib/ZeroMQ/ApplicationZeroMQ.$(OBJEXT)
+	-rm -f lib/ZeroMQ/ZeroMQBatchJob.$(OBJEXT)
+	-rm -f lib/ZeroMQ/ZeroMQQueueThread.$(OBJEXT)
+	-rm -f lib/ZeroMQ/ZeroMQThread.$(OBJEXT)
+	-rm -f lib/ZeroMQ/ZeroMQWorkerThread.$(OBJEXT)

 distclean-compile:
 	-rm -f *.tab.c
@ -4534,9 +4732,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-

 # Copyright (C) 1996-2012 Free Software Foundation, Inc.

@ -25,6 +25,8 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@ -34,7 +36,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.3], [],
+m4_if([$1], [1.12.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@ -50,7 +52,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.3])dnl
+[AM_AUTOMAKE_VERSION([1.12.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@ -63,6 +65,8 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 2
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
@ -116,6 +120,8 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 10
+
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
@ -147,6 +153,7 @@ fi])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 17

 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@ -338,6 +345,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 6

 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@ -414,6 +422,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 19
+
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.

@ -488,11 +498,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@ -565,6 +571,8 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 8
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@ -586,6 +594,8 @@ AC_SUBST([install_sh])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 2
+
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@ -607,6 +617,8 @@ AC_SUBST([am__leading_dot])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 5
+
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@ -655,6 +667,8 @@ rm -f confinc confmf
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 6
+
 # AM_PROG_CC_C_O
 # --------------
 # Like AC_PROG_CC_C_O, but changed for automake.
@ -689,6 +703,8 @@ m4_define([AC_PROG_CC],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 7
+
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@ -696,6 +712,7 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])

+
 # AM_MISSING_HAS_RUN
 # ------------------
 # Define MISSING if not defined so far and test if it supports --run.
@ -728,6 +745,8 @@ fi
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 6
+
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@ -759,6 +778,8 @@ AC_DEFUN([_AM_IF_OPTION],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 9
+
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
@ -840,6 +861,8 @@ rm -f conftest.file
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 3
+
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
@ -900,6 +923,8 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 2
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor 'install' (even GNU) is that you can't
@ -928,6 +953,8 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 3
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@ -947,6 +974,8 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

+# serial 3
+
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
--- a/config/config.guess
+++ b/config/config.guess
@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.

-timestamp='2012-06-17'
+timestamp='2012-02-10'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -138,6 +138,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

+case "${UNAME_MACHINE}" in
+  i?86)
+     test -z "$VENDOR" && VENDOR=pc
+     ;;
+  *)
+     test -z "$VENDOR" && VENDOR=unknown
+     ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -200,25 +210,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
    *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
 	exit ;;
    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
 	exit ;;
    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
 	exit ;;
    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
    alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@ -286,13 +292,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo alpha-dec-winnt3.5
 	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-${VENDOR}-sysv4
 	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
 	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+	echo ${UNAME_MACHINE}-${VENDOR}-morphos
 	exit ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
@ -307,7 +313,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
+	echo arm-${VENDOR}-riscos
 	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@ -415,7 +421,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m68k-hades-mint${UNAME_RELEASE}
 	exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
+	echo m68k-${VENDOR}-mint${UNAME_RELEASE}
 	exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@ -726,9 +732,9 @@ EOF
 	exit ;;
    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
 	fi
 	exit ;;
    parisc*:Lites*:*:*)
@ -788,18 +794,18 @@ EOF
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
    i*:CYGWIN*:*)
@ -824,10 +830,10 @@ EOF
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
+		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
+		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@ -846,31 +852,31 @@ EOF
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
+	echo x86_64-${VENDOR}-cygwin
 	exit ;;
    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
+	echo powerpcle-${VENDOR}-cygwin
 	exit ;;
    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -884,26 +890,26 @@ EOF
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabihf
 	    fi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    cris:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-gnu
@ -912,10 +918,10 @@ EOF
 	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	LIBC=gnu
@ -929,13 +935,13 @@ EOF
 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@ -954,54 +960,54 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-${VENDOR}-linux-gnu
 	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux-gnu
 	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+	  *)    echo hppa-${VENDOR}-linux-gnu ;;
 	esac
 	exit ;;
    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux-gnu
 	exit ;;
    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux-gnu
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -1023,16 +1029,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
+	echo ${UNAME_MACHINE}-${VENDOR}-stop
 	exit ;;
    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
+	echo ${UNAME_MACHINE}-${VENDOR}-atheos
 	exit ;;
    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
+	echo i386-${VENODR}-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
@ -1052,7 +1058,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit ;;
    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@ -1091,7 +1097,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-${VENODR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
 	exit ;;
    mini*:CTIX:SYS*5:*)
@ -1128,19 +1134,19 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
@ -1190,7 +1196,7 @@ EOF
 	if [ -d /usr/nec ]; then
 		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-${VENDOR}-sysv${UNAME_RELEASE}
 	fi
 	exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@ -1260,7 +1266,7 @@ EOF
    NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
+    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
    NSR-?:NONSTOP_KERNEL:*:*)
@ -1284,13 +1290,13 @@ EOF
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
+	echo ${UNAME_MACHINE}-${VENDOR}-plan9
 	exit ;;
    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
+	echo pdp10-${VENDOR}-tops10
 	exit ;;
    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
+	echo pdp10-${VENDOR}-tenex
 	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
@ -1299,16 +1305,16 @@ EOF
 	echo pdp10-xkl-tops20
 	exit ;;
    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
+	echo pdp10-${VENDOR}-tops20
 	exit ;;
    *:ITS:*:*)
-	echo pdp10-unknown-its
+	echo pdp10-${VENDOR}-its
 	exit ;;
    SEI:*:*:SEIUX)
 	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@ -1330,7 +1336,7 @@ EOF
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
+	echo ${UNAME_MACHINE}-${VENDOR}-esx
 	exit ;;
 esac

--- a/config/config.sub
+++ b/config/config.sub
@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.

-timestamp='2012-06-17'
+timestamp='2012-04-18'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -1352,7 +1352,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@ -1543,9 +1543,6 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
-	hexagon-*)
-		os=-elf
-		;;
 	tic54x-*)
 		os=-coff
 		;;
--- a/config/depcomp
+++ b/config/depcomp
@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2012-07-12.20; # UTC
+scriptversion=2012-03-27.16; # UTC

 # Copyright (C) 1999-2012 Free Software Foundation, Inc.

@ -334,79 +334,6 @@ icc)
  rm -f "$tmpdepfile"
  ;;

-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
-  tmpdepfile="$base.d"
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir="$base.d-lock"
-  trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0 ; do
-    # mkdir is a portable test-and-set.
-    if mkdir $lockdir 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rm -rf $lockdir
-      break
-    else
-      ## the lock is being held by a different process,
-      ## wait until the winning process is done or we timeout
-      while test -d $lockdir && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
--- a/7
+++ b/7
@ -3300,12 +3300,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}

 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
+mkdir_p="$MKDIR_P"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
--- a/packetize.sh
+++ b/packetize.sh
@ -168,7 +168,7 @@ echo
 echo "########################################################"
 echo "Call mkepmlist to create a sublist"

-  for dir in js/actions/system js/server js/server/modules js/client js/client/modules js/common/modules js/common/bootstrap; do
+  for dir in `find js -type d`; do
      echo "    mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}"
      mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}
  done