gceph: fix compile

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/Makefile.am b/src/Makefile.am
index b07fe2407dfa4997b749bdd5f701cceb271d14ed..8c16203f36869b0caa5769b035f89cf5ecbe9b5b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,7 @@ gceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm $(CRYPTOPP_LIBS) \
        $(GTKMM_LIBS)
 gceph_CXXFLAGS = ${AM_CFLAGS} $(GTKMM_CFLAGS) \
        -DCEPH_TOOL_GUIDIR="\"${ceph_tool_guidir}\""
+bin_PROGRAMS += gceph
 endif
 
 cconf_SOURCES = cconf.cc

diff --git a/src/config.h b/src/config.h
index f5853c144631154c514c8eb40ea7fb7ec5e342fd..1d1ddb72f9e9916d637d9f5af84371e54e22050c 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -543,9 +543,9 @@ ExportControl *conf_get_export_control();
        conf_cmd_equals(args[i], str_cmd, char_cmd, &val_pos)
 
 #define DEFINE_CONF_VARS(usage_func) \
-       unsigned int val_pos; \
-       void (*args_usage)() = usage_func; \
-       bool __isarg
+       unsigned int val_pos __attribute__((unused)); \
+       void (*args_usage)() __attribute__((unused)) = usage_func; \
+       bool __isarg __attribute__((unused))
 
 
 #define FOR_EACH_ARG(args) \

diff --git a/src/tools/gceph.cc b/src/tools/gceph.cc
index 3c3fb8b083b1c2975868dbfe16ade19afdcdc0f0..3dddbf1467731472e4832a1f51fcb8f9c3be5e68 100644 (file)
--- a/src/tools/gceph.cc
+++ b/src/tools/gceph.cc
@@ -13,9 +13,12 @@
  *
  */
 
+#include "ceph.h"
+#include "common/common_init.h"
 #include "config.h"
 
 #include <iostream>
+#include <sstream>
 #include <vector>
 
 // tool/gui.cc
@@ -44,7 +47,7 @@ static void parse_gceph_args(const vector<const char*> &args)
   }
 }
 
-static int cephtool_run_gui()
+static int cephtool_run_gui(int argc, const char **argv)
 {
   g.log = &gss;
   g.slog = &gss;
@@ -75,18 +78,18 @@ int main(int argc, const char **argv)
 
   parse_gceph_args(args);
 
-  if (cephtool_common_init(CEPH_TOOL_MODE_GUI)) {
+  if (ceph_tool_common_init(CEPH_TOOL_MODE_GUI)) {
     cerr << "cephtool_common_init failed." << std::endl;
     return 1;
   }
 
-  if (cephtool_run_gui())
+  if (cephtool_run_gui(argc, argv))
     ret = 1;
 
   if (ceph_tool_messenger_shutdown())
     ret = 1;
 
-  if (cephtool_common_shutdown())
+  if (ceph_tool_common_shutdown())
     ret = 1;
 
   return ret;