Changeset 2413

Timestamp:

Feb 13, 2009, 4:33:52 PM (16 years ago)

Author:

Christoph Mayer

Message:

-letzte fixes von tidy umstellung

Files:

• sample/pingpong/PingPong.cpp (modified) (1 diff)
• sample/pingpong/PingPong.h (modified) (1 diff)
• sample/pingpong/PingPongMessage.h (modified) (1 diff)
• sample/pingpong/main.cpp (modified) (1 diff)
• source/ariba/Makefile.am (modified) (2 diffs)

sample/pingpong/PingPong.cpp

@@ -121 +121 @@
 // timer event
 void PingPong::eventFunction() {
-
-        logging_info("pinging our remote nodes");
-//      RemoteNodes::iterator i = remoteNodes.begin();
-//      RemoteNodes::iterator iend = remoteNodes.end();
-//
-//      pingid++;
-//
-//      for (; i != iend; i++) {
-//              logging_info("     -> pinging " << i->first);
-//
-//              PingPongMessage pingmsg(pingid);
-//              overlay->sendMessage(&pingmsg, i->second);
-//      }
 }
 

sample/pingpong/PingPong.h

@@ -63 +63 @@
         // the current ping id
         unsigned long pingId;
-
-//      // the known remote nodes
-//      typedef map<NodeID, LinkID> RemoteNodes;
-//      RemoteNodes remoteNodes;
 };
 

sample/pingpong/PingPongMessage.h

@@ -1 +1 @@
 #ifndef PINGPONGMESSAGES_H_
 #define PINGPONGMESSAGES_H_
-
-// #include "ariba/utility/messages.h"
-// #include "ariba/utility/serialization.h"
-// #include "ariba/utility/misc/Helper.h"
-// using ariba::utility::Message;
 
 #include <string>

sample/pingpong/main.cpp

@@ -1 +1 @@
 #include <string>
 #include "ariba/utility/system/StartupWrapper.h"
-#include "TidyPingPong.h"
+#include "PingPong.h"
 
 using std::string;

source/ariba/Makefile.am

@@ -363 +363 @@
 # make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-libariba_ladir = ${pkgincludedir}
-
-#interfaces headers for make install - don't 
-#remove the here listed .h files from _SOURCES!
-libariba_la_HEADERS = \
-  tidy/ariba.h \
-  tidy/AribaModule.h \
-  tidy/DataMessage.h \
-  tidy/Identifiers.h \
-  tidy/LinkProperties.h \
-  tidy/Module.h \
-  tidy/Name.h \
-  tidy/Node.h \
-  tidy/NodeListener.h \
-  tidy/SpoVNetProperties.h \
-  tidy/TidyCommunicationListener.h \
-  tidy/TidyMessage.h
+# libariba_ladir = ${pkgincludedir}
+# 
+# #interfaces headers for make install - don't 
+# #remove the here listed .h files from _SOURCES!
+# libariba_la_HEADERS = \
+#   tidy/ariba.h \
+#   tidy/AribaModule.h \
+#   tidy/DataMessage.h \
+#   tidy/Identifiers.h \
+#   tidy/LinkProperties.h \
+#   tidy/Module.h \
+#   tidy/Name.h \
+#   tidy/Node.h \
+#   tidy/NodeListener.h \
+#   tidy/SpoVNetProperties.h \
+#   tidy/TidyCommunicationListener.h \
+#   tidy/TidyMessage.h
 
 # old make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -387 +387 @@
 # header files to install - TODO: extract all *.h and *.hpp files ~~~~
 
-#libariba_ladir = ${pkgincludedir}
-
-# install-data-local:
-#       @for f in $(libariba_la_SOURCES); do \
-#               d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
-#               $(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
-#               if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
-#               $(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
-#       done
-# 
-# uninstall-local:
-#       rm -rf $(DESTDIR)$(libariba_ladir)
+libariba_ladir = ${pkgincludedir}
+
+install-data-local:
+        @for f in $(libariba_la_SOURCES); do \
+                d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
+                $(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
+                if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
+                $(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
+        done
+
+uninstall-local:
+        rm -rf $(DESTDIR)$(libariba_ladir)