6 files changed, 72 insertions, 27 deletions
diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp
index 22de6e9..3100466 100644
--- a/src/Client/CommandParser.cpp
+++ b/src/Client/CommandParser.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "CommandParser.h"
-#include <Common/Request/CoreStatusRequest.h>
+#include "Request/CoreStatusRequest.h"
 #include <Common/Request/DisconnectRequest.h>
 
 #include <iostream>
@@ -85,7 +85,7 @@ void CommandParser::helpCommand(const std::vector<std::string> &args) {
 void CommandParser::statusCommand(const std::vector<std::string>&) {
   activeRequests++;
 
-  Common::Request::CoreStatusRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::coreStatusRequestFinished));
+  Request::CoreStatusRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::coreStatusRequestFinished));
 }
 
 void CommandParser::exitCommand(const std::vector<std::string>&) {
diff --git a/src/Common/Request/CoreStatusRequest.h b/src/Client/Request/CoreStatusRequest.h
index 48c9302..328c4ff 100644
--- a/src/Common/Request/CoreStatusRequest.h
+++ b/src/Client/Request/CoreStatusRequest.h
@@ -17,28 +17,28 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_
-#define MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_
+#ifndef MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_
+#define MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_
 
-#include "Request.h"
-#include "../RequestManager.h"
+#include <Common/RequestManager.h>
+#include <Common/Request/Request.h>
 #include <Net/Connection.h>
 #include <Net/Packets/HostStatusPacket.h>
 
 #include <sigc++/signal.h>
 
 namespace Mad {
-namespace Common {
+namespace Client {
 namespace Request {
 
-class CoreStatusRequest: public Request {
+class CoreStatusRequest: public Common::Request::Request {
   private:
     sigc::signal<void,const Net::Packets::HostStatusPacket&> finished;
 
     CoreStatusRequest() {}
 
   public:
-    static bool send(Net::Connection *connection, RequestManager &requestManager, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback) {
+    static bool send(Net::Connection *connection, Common::RequestManager &requestManager, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback) {
       CoreStatusRequest *request = new CoreStatusRequest();
 
       request->finished.connect(callback);
@@ -79,4 +79,4 @@ class CoreStatusRequest: public Request {
 }
 }
 
-#endif /* MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_ */
+#endif /* MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_ */
diff --git a/src/Client/Request/Makefile.am b/src/Client/Request/Makefile.am
index 33bc72a..58db76c 100644
--- a/src/Client/Request/Makefile.am
+++ b/src/Client/Request/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = 
+noinst_HEADERS = CoreStatusRequest.h
diff --git a/src/Client/Request/Makefile.in b/src/Client/Request/Makefile.in
index 1ac4924..d81a597 100644
--- a/src/Client/Request/Makefile.in
+++ b/src/Client/Request/Makefile.in
@@ -45,6 +45,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -162,7 +164,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_HEADERS = 
+noinst_HEADERS = CoreStatusRequest.h
 all: all-am
 
 .SUFFIXES:
@@ -201,12 +203,53 @@ mostlyclean-libtool:
 
 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; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
 tags: TAGS
-TAGS:
 
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
-CTAGS:
-
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && 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'`; \
@@ -268,7 +311,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -318,16 +361,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool 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-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean 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-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
 
 # 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/src/Common/Request/Makefile.am b/src/Common/Request/Makefile.am
index 4c6ffd5..64c5078 100644
--- a/src/Common/Request/Makefile.am
+++ b/src/Common/Request/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = CoreStatusRequest.h DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
+noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
diff --git a/src/Common/Request/Makefile.in b/src/Common/Request/Makefile.in
index 6c3b68d..4aa720d 100644
--- a/src/Common/Request/Makefile.in
+++ b/src/Common/Request/Makefile.in
@@ -164,7 +164,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_HEADERS = CoreStatusRequest.h DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
+noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
 all: all-am
 
 .SUFFIXES: