From b05a162d329930774907670d6bc9cc8bcd2cdf24 Mon Sep 17 00:00:00 2001
From: mrbesen <y.g.2@gmx.de>
Date: Sat, 22 Feb 2020 05:02:13 +0100
Subject: [PATCH] moved own includes from inc/ to src/main/cpp/inc

---
 Makefile                                | 2 +-
 {inc => src/main/cpp/inc}/event.h       | 0
 {inc => src/main/cpp/inc}/libplugin.h   | 0
 {inc => src/main/cpp/inc}/plugin.h      | 0
 testplugins/01verysimpleplugin/Makefile | 4 ++--
 testplugins/02simpleEvents/Makefile     | 2 +-
 testplugins/03simpleCmd/Makefile        | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename {inc => src/main/cpp/inc}/event.h (100%)
 rename {inc => src/main/cpp/inc}/libplugin.h (100%)
 rename {inc => src/main/cpp/inc}/plugin.h (100%)

diff --git a/Makefile b/Makefile
index e8b551f..3f862b2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SRCDIR   = src/main/cpp/src/
 BUILDDIR = target/
 INCDIR   = $(BUILDDIR)inc/
 INSTALLDIR = /usr/lib/
-LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -Iinc/ #-ldl
+LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -Isrc/main/cpp/inc/ #-ldl
 NAME     = libplugin.so
 
 SRCFILES = $(wildcard $(SRCDIR)*.cpp)
diff --git a/inc/event.h b/src/main/cpp/inc/event.h
similarity index 100%
rename from inc/event.h
rename to src/main/cpp/inc/event.h
diff --git a/inc/libplugin.h b/src/main/cpp/inc/libplugin.h
similarity index 100%
rename from inc/libplugin.h
rename to src/main/cpp/inc/libplugin.h
diff --git a/inc/plugin.h b/src/main/cpp/inc/plugin.h
similarity index 100%
rename from inc/plugin.h
rename to src/main/cpp/inc/plugin.h
diff --git a/testplugins/01verysimpleplugin/Makefile b/testplugins/01verysimpleplugin/Makefile
index 41a7a4e..97d7f4f 100644
--- a/testplugins/01verysimpleplugin/Makefile
+++ b/testplugins/01verysimpleplugin/Makefile
@@ -1,8 +1,8 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
-LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -I../../src/main/cpp/inc
+INCDIR   = ../../src/main/cpp/inc
+LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = verysimpleplugin.so
 
 all:
diff --git a/testplugins/02simpleEvents/Makefile b/testplugins/02simpleEvents/Makefile
index ff6f16a..54edfdf 100644
--- a/testplugins/02simpleEvents/Makefile
+++ b/testplugins/02simpleEvents/Makefile
@@ -1,7 +1,7 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
+INCDIR   = ../../src/main/cpp/inc
 LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = simpleevents.so
 
diff --git a/testplugins/03simpleCmd/Makefile b/testplugins/03simpleCmd/Makefile
index dd0f49c..f5610c6 100644
--- a/testplugins/03simpleCmd/Makefile
+++ b/testplugins/03simpleCmd/Makefile
@@ -1,7 +1,7 @@
 
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g
 SRCDIR   = src/
-INCDIR   = ../../inc
+INCDIR   = ../../src/main/cpp/inc
 LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR)
 NAME     = simpleCmd.so