Cleaned up repository, moved files where they belong to.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

14 files changed, 21 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 35e3a38..dbeff62 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,23 @@ endif
 include $(DPP_ROOT)/Makefile.inc
 
 DRIVER0_NAME = driver
-DRIVER0_OBJECTS = $(DRIVER0_NAME).o ksocket.o berkeley.o
+DRIVER0_OBJECTS = examples/$(DRIVER0_NAME).o ksocket.o berkeley.o
 DRIVER0_TARGET = $(DRIVER0_NAME).sys
 
 DRIVER1_NAME = driver-protobuf-c
-DRIVER1_OBJECTS = $(DRIVER1_NAME).o protobuf-c/protobuf-c.o protobuf-c/example.pb-c.o
+DRIVER1_OBJECTS = examples/$(DRIVER1_NAME).o protobuf-c/protobuf-c.o examples/example.pb-c.o
 DRIVER1_TARGET = $(DRIVER1_NAME).sys
 
 DRIVER2_NAME = driver-protobuf-c-tcp
-DRIVER2_OBJECTS = $(DRIVER2_NAME).o ksocket.o berkeley.o protobuf-c/protobuf-c.o protobuf-c/example.pb-c.o
+DRIVER2_OBJECTS = examples/$(DRIVER2_NAME).o ksocket.o berkeley.o protobuf-c/protobuf-c.o examples/example.pb-c.o
 DRIVER2_TARGET = $(DRIVER2_NAME).sys
 
 USERSPACE0_NAME = userspace_client
-USERSPACE0_OBJECTS = $(USERSPACE0_NAME).o
+USERSPACE0_OBJECTS = examples/$(USERSPACE0_NAME).o
 USERSPACE0_TARGET = $(USERSPACE0_NAME).exe
 
 USERSPACE1_NAME = userspace_client_protobuf
-USERSPACE1_OBJECTS = $(USERSPACE1_NAME).o protobuf-c/protobuf-c.o protobuf-c/example.pb-c.o
+USERSPACE1_OBJECTS = examples/$(USERSPACE1_NAME).o protobuf-c/protobuf-c.o examples/example.pb-c.o
 USERSPACE1_TARGET = $(USERSPACE1_NAME).exe
 
 # mingw-w64-dpp related
@@ -53,15 +53,18 @@ $(USERSPACE0_TARGET): $(USERSPACE0_OBJECTS)
 $(USERSPACE1_TARGET): $(USERSPACE1_OBJECTS)
 	$(call LINK_CPP_USER_TARGET,$(USERSPACE1_OBJECTS),$@)
 
+generate:
+	protoc-c --c_out=. examples/example.proto
+
 install: $(DRIVER0_TARGET) $(DRIVER1_TARGET) $(DRIVER2_TARGET) $(USERSPACE0_TARGET) $(USERSPACE1_TARGET)
 	$(call INSTALL_EXEC_SIGN,$(DRIVER0_TARGET))
 	$(call INSTALL_EXEC_SIGN,$(DRIVER1_TARGET))
 	$(call INSTALL_EXEC_SIGN,$(DRIVER2_TARGET))
 	$(call INSTALL_EXEC,$(USERSPACE0_TARGET))
 	$(call INSTALL_EXEC,$(USERSPACE1_TARGET))
-	$(INSTALL) '$(DRIVER0_NAME).bat' '$(DESTDIR)/'
-	$(INSTALL) '$(DRIVER1_NAME).bat' '$(DESTDIR)/'
-	$(INSTALL) '$(DRIVER2_NAME).bat' '$(DESTDIR)/'
+	$(INSTALL) 'examples/$(DRIVER0_NAME).bat' '$(DESTDIR)/'
+	$(INSTALL) 'examples/$(DRIVER1_NAME).bat' '$(DESTDIR)/'
+	$(INSTALL) 'examples/$(DRIVER2_NAME).bat' '$(DESTDIR)/'
 
 clean:
 	rm -f $(DRIVER0_OBJECTS) $(DRIVER1_OBJECTS) $(DRIVER2_OBJECTS)
diff --git a/common.hpp b/common.hpp
index 0cbbe6b..2632fc0 100644
--- a/common.hpp
+++ b/common.hpp
@@ -1,4 +1,4 @@
-#include "protobuf-c/example.pb-c.h"
+#include "examples/example.pb-c.h"
 
 #include <EASTL/algorithm.h>
 #include <EASTL/array.h>
diff --git a/driver-protobuf-c-tcp.bat b/examples/driver-protobuf-c-tcp.bat
index 9aa935b..9aa935b 100644
--- a/driver-protobuf-c-tcp.bat
+++ b/examples/driver-protobuf-c-tcp.bat
diff --git a/driver-protobuf-c-tcp.cpp b/examples/driver-protobuf-c-tcp.cpp
index 0808b88..da2142d 100644
--- a/driver-protobuf-c-tcp.cpp
+++ b/examples/driver-protobuf-c-tcp.cpp
@@ -1,6 +1,6 @@
 #include "berkeley.h"
 #include "ksocket.h"
-#include "protobuf-c/example.pb-c.h"
+#include "examples/example.pb-c.h"
 #include "wsk.h"
 
 #include "common.hpp"
diff --git a/driver-protobuf-c.bat b/examples/driver-protobuf-c.bat
index 671bf19..671bf19 100644
--- a/driver-protobuf-c.bat
+++ b/examples/driver-protobuf-c.bat
diff --git a/driver-protobuf-c.cpp b/examples/driver-protobuf-c.cpp
index 762137c..942782d 100644
--- a/driver-protobuf-c.cpp
+++ b/examples/driver-protobuf-c.cpp
@@ -1,6 +1,6 @@
 #include "berkeley.h"
 #include "ksocket.h"
-#include "protobuf-c/example.pb-c.h"
+#include "examples/example.pb-c.h"
 #include "wsk.h"
 
 #include "common.hpp"
diff --git a/driver.bat b/examples/driver.bat
index 519d9e8..519d9e8 100644
--- a/driver.bat
+++ b/examples/driver.bat
diff --git a/driver.cpp b/examples/driver.cpp
index ceae8ff..ceae8ff 100644
--- a/driver.cpp
+++ b/examples/driver.cpp
diff --git a/echo_srv.py b/examples/echo_srv.py
index b3855eb..b3855eb 100644
--- a/echo_srv.py
+++ b/examples/echo_srv.py
diff --git a/protobuf-c/example.pb-c.c b/examples/example.pb-c.c
index abce500..20b33ae 100644
--- a/protobuf-c/example.pb-c.c
+++ b/examples/example.pb-c.c
@@ -1,12 +1,12 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: protobuf-c/example.proto */
+/* Generated from: examples/example.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "protobuf-c/example.pb-c.h"
+#include "examples/example.pb-c.h"
 void   something_with_uints__init
                      (SomethingWithUINTs         *message)
 {
diff --git a/protobuf-c/example.pb-c.h b/examples/example.pb-c.h
index b1fc5a0..9e4f1db 100644
--- a/protobuf-c/example.pb-c.h
+++ b/examples/example.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: protobuf-c/example.proto */
+/* Generated from: examples/example.proto */
 
-#ifndef PROTOBUF_C_protobuf_2dc_2fexample_2eproto__INCLUDED
-#define PROTOBUF_C_protobuf_2dc_2fexample_2eproto__INCLUDED
+#ifndef PROTOBUF_C_examples_2fexample_2eproto__INCLUDED
+#define PROTOBUF_C_examples_2fexample_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -163,4 +163,4 @@ extern const ProtobufCEnumDescriptor    even_more__some_enum__descriptor;
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_protobuf_2dc_2fexample_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_examples_2fexample_2eproto__INCLUDED */
diff --git a/protobuf-c/example.proto b/examples/example.proto
index e77f36c..e77f36c 100644
--- a/protobuf-c/example.proto
+++ b/examples/example.proto
diff --git a/userspace_client.cpp b/examples/userspace_client.cpp
index cb2a3b4..cb2a3b4 100644
--- a/userspace_client.cpp
+++ b/examples/userspace_client.cpp
diff --git a/userspace_client_protobuf.cpp b/examples/userspace_client_protobuf.cpp
index 7ee674e..b8ad711 100644
--- a/userspace_client_protobuf.cpp
+++ b/examples/userspace_client_protobuf.cpp
@@ -4,7 +4,7 @@
 #include <ws2tcpip.h>
 
 #include "common.hpp"
-#include "protobuf-c/example.pb-c.h"
+#include "examples/example.pb-c.h"
 
 int main(int argc, char **argv) {
   WSADATA wsaData = {};