From 924ee44a9e5740ffcf5a52947b1daf9307a078dc Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 26 Jul 2012 11:44:14 +0200 Subject: [PATCH] issue #129: fixed "make tags" --- Makefile.am | 3 +++ Makefile.in | 30 +++++++++++++----------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index aafd020274..3e9e53da76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,9 @@ sbin_PROGRAMS = \ bin/arangod \ bin/arango-password +# exclude arango-password from sources list +bin_arango_password_SOURCES = + ################################################################################ ### @brief /bin programs ################################################################################ diff --git a/Makefile.in b/Makefile.in index ea3c045404..762e3f843f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -608,8 +608,8 @@ am__UnitTests_geo_suite_SOURCES_DIST = UnitTests/Cambridge/Runner.cpp \ @ENABLE_BOOST_TEST_TRUE@ UnitTests/Cambridge/UnitTests_geo_suite-georeg.$(OBJEXT) \ @ENABLE_BOOST_TEST_TRUE@ arangod/GeoIndex/UnitTests_geo_suite-GeoIndex.$(OBJEXT) UnitTests_geo_suite_OBJECTS = $(am_UnitTests_geo_suite_OBJECTS) -bin_arango_password_SOURCES = bin/arango-password.c -bin_arango_password_OBJECTS = bin/arango-password.$(OBJEXT) +am_bin_arango_password_OBJECTS = +bin_arango_password_OBJECTS = $(am_bin_arango_password_OBJECTS) bin_arango_password_LDADD = $(LDADD) am__bin_arangod_SOURCES_DIST = arangod/Actions/actions.cpp \ arangod/Actions/ActionDispatcherThread.cpp \ @@ -816,7 +816,7 @@ 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) \ $(UnitTests_basics_suite_SOURCES) \ - $(UnitTests_geo_suite_SOURCES) bin/arango-password.c \ + $(UnitTests_geo_suite_SOURCES) $(bin_arango_password_SOURCES) \ $(bin_arangod_SOURCES) $(bin_arangoimp_SOURCES) \ $(bin_arangoirb_SOURCES) $(bin_arangosh_SOURCES) \ $(bin_zclient_SOURCES) $(bin_zserver_SOURCES) @@ -826,10 +826,11 @@ DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \ $(am__lib_libarango_mruby_a_SOURCES_DIST) \ $(lib_libarango_v8_a_SOURCES) \ $(am__UnitTests_basics_suite_SOURCES_DIST) \ - $(am__UnitTests_geo_suite_SOURCES_DIST) bin/arango-password.c \ - $(am__bin_arangod_SOURCES_DIST) $(bin_arangoimp_SOURCES) \ - $(am__bin_arangoirb_SOURCES_DIST) $(bin_arangosh_SOURCES) \ - $(bin_zclient_SOURCES) $(bin_zserver_SOURCES) + $(am__UnitTests_geo_suite_SOURCES_DIST) \ + $(bin_arango_password_SOURCES) $(am__bin_arangod_SOURCES_DIST) \ + $(bin_arangoimp_SOURCES) $(am__bin_arangoirb_SOURCES_DIST) \ + $(bin_arangosh_SOURCES) $(bin_zclient_SOURCES) \ + $(bin_zserver_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -1143,6 +1144,9 @@ AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @MATH_LDFLAGS@ \ noinst_LIBRARIES = lib/libarango.a lib/libarango_v8.a \ lib/libarango_fe.a lib/libarango_client.a $(am__append_6) +# exclude arango-password from sources list +bin_arango_password_SOURCES = + ################################################################################ ### @brief /etc data ################################################################################ @@ -2453,11 +2457,6 @@ UnitTests/geo_suite$(EXEEXT): $(UnitTests_geo_suite_OBJECTS) $(UnitTests_geo_sui bin/$(am__dirstamp): @$(MKDIR_P) bin @: > bin/$(am__dirstamp) -bin/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) bin/$(DEPDIR) - @: > bin/$(DEPDIR)/$(am__dirstamp) -bin/arango-password.$(OBJEXT): bin/$(am__dirstamp) \ - bin/$(DEPDIR)/$(am__dirstamp) arangod/Actions/$(am__dirstamp): @$(MKDIR_P) arangod/Actions @: > arangod/Actions/$(am__dirstamp) @@ -2915,7 +2914,6 @@ mostlyclean-compile: -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 bin/arango-password.$(OBJEXT) -rm -f lib/Admin/ApplicationAdminServer.$(OBJEXT) -rm -f lib/Admin/RestAdminBaseHandler.$(OBJEXT) -rm -f lib/Admin/RestAdminFeConfigurationHandler.$(OBJEXT) @@ -3185,7 +3183,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangosh-ImportHelper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangosh-V8ClientConnection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangosh-arangosh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/arango-password.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/Admin/$(DEPDIR)/ApplicationAdminServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/Admin/$(DEPDIR)/RestAdminBaseHandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/Admin/$(DEPDIR)/RestAdminFeConfigurationHandler.Po@am__quote@ @@ -5066,7 +5063,6 @@ distclean-generic: -rm -f arangoirb/MRClient/$(am__dirstamp) -rm -f arangosh/V8Client/$(DEPDIR)/$(am__dirstamp) -rm -f arangosh/V8Client/$(am__dirstamp) - -rm -f bin/$(DEPDIR)/$(am__dirstamp) -rm -f bin/$(am__dirstamp) -rm -f lib/$(am__dirstamp) -rm -f lib/Admin/$(DEPDIR)/$(am__dirstamp) @@ -5131,7 +5127,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) bin/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) + -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -5180,7 +5176,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) bin/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) + -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic