From 39fc0656d1aaec4d1da17d67be847b193f8558c8 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Mon, 29 Jan 2018 18:09:18 +0100
Subject: [PATCH] move specctra. files in a specific folder
 specctra_import_export

---
 pcbnew/CMakeLists.txt                         | 21 ++++++++++---------
 .../{ => specctra_import_export}/specctra.cpp |  2 +-
 .../{ => specctra_import_export}/specctra.h   |  2 +-
 .../specctra.keywords                         |  0
 .../specctra_export.cpp                       |  2 +-
 .../specctra_import.cpp                       |  2 +-
 .../specctra_test.cpp                         |  2 +-
 7 files changed, 16 insertions(+), 15 deletions(-)
 rename pcbnew/{ => specctra_import_export}/specctra.cpp (99%)
 rename pcbnew/{ => specctra_import_export}/specctra.h (99%)
 rename pcbnew/{ => specctra_import_export}/specctra.keywords (100%)
 rename pcbnew/{ => specctra_import_export}/specctra_export.cpp (99%)
 rename pcbnew/{ => specctra_import_export}/specctra_import.cpp (99%)
 rename pcbnew/{ => specctra_import_export}/specctra_test.cpp (99%)

diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index b01693e42c..176628b680 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -46,6 +46,7 @@ include_directories(
     ./import_dxf
     ../utils/idftools
     ${GLM_INCLUDE_DIR}
+    ./specctra_import_export
     ${INC_AFTER}
     )
 
@@ -270,10 +271,10 @@ set( PCBNEW_CLASS_SRCS
     print_board_functions.cpp
     printout_controler.cpp
     ratsnest.cpp
-    specctra.cpp
-    specctra_export.cpp
-    specctra_import.cpp
-    specctra_keywords.cpp
+    specctra_import_export/specctra.cpp
+    specctra_import_export/specctra_export.cpp
+    specctra_import_export/specctra_import.cpp
+    specctra_import_export/specctra_keywords.cpp
     swap_layers.cpp
     target_edit.cpp
     tool_modedit.cpp
@@ -347,20 +348,20 @@ set( PCBNEW_SCRIPTING_PYTHON_HELPERS
 
 # auto-generate specctra_lexer.h and specctra_keywords.cpp
 make_lexer(
-    ${CMAKE_CURRENT_SOURCE_DIR}/specctra.keywords
-    ${CMAKE_CURRENT_SOURCE_DIR}/specctra_lexer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/specctra_keywords.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/specctra_import_export/specctra.keywords
+    ${CMAKE_CURRENT_SOURCE_DIR}/specctra_import_export/specctra_lexer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/specctra_import_export/specctra_keywords.cpp
     DSN
 
     # Pass header file with dependency on *_lexer.h as extra_arg
-    specctra.h
+    specctra_import_export/specctra.h
     )
 
 add_custom_target(
     specctra_lexer_source_files ALL
     DEPENDS
-        ${CMAKE_CURRENT_SOURCE_DIR}/specctra_lexer.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/specctra_keywords.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/specctra_import_export/specctra_lexer.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/specctra_import_export/specctra_keywords.cpp
     )
 
 
diff --git a/pcbnew/specctra.cpp b/pcbnew/specctra_import_export/specctra.cpp
similarity index 99%
rename from pcbnew/specctra.cpp
rename to pcbnew/specctra_import_export/specctra.cpp
index b09e4a10e8..7e4eb5bfc8 100644
--- a/pcbnew/specctra.cpp
+++ b/pcbnew/specctra_import_export/specctra.cpp
@@ -55,7 +55,7 @@
 #include <class_board.h>
 #include <class_track.h>
 
-#include <specctra.h>
+#include "specctra.h"
 #include <macros.h>
 
 
diff --git a/pcbnew/specctra.h b/pcbnew/specctra_import_export/specctra.h
similarity index 99%
rename from pcbnew/specctra.h
rename to pcbnew/specctra_import_export/specctra.h
index 5b86e276c0..1d2a60f586 100644
--- a/pcbnew/specctra.h
+++ b/pcbnew/specctra_import_export/specctra.h
@@ -33,7 +33,7 @@
 #include <boost/ptr_container/ptr_set.hpp>
 
 #include <fctsys.h>
-#include <specctra_lexer.h>
+#include "specctra_lexer.h"
 #include <pcbnew.h>
 
 #include <memory>
diff --git a/pcbnew/specctra.keywords b/pcbnew/specctra_import_export/specctra.keywords
similarity index 100%
rename from pcbnew/specctra.keywords
rename to pcbnew/specctra_import_export/specctra.keywords
diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_import_export/specctra_export.cpp
similarity index 99%
rename from pcbnew/specctra_export.cpp
rename to pcbnew/specctra_import_export/specctra_export.cpp
index 71a0c24844..1e40da8037 100644
--- a/pcbnew/specctra_export.cpp
+++ b/pcbnew/specctra_import_export/specctra_export.cpp
@@ -55,7 +55,7 @@
 
 #include <geometry/shape_poly_set.h>
 
-#include <specctra.h>
+#include "specctra.h"
 
 using namespace DSN;
 
diff --git a/pcbnew/specctra_import.cpp b/pcbnew/specctra_import_export/specctra_import.cpp
similarity index 99%
rename from pcbnew/specctra_import.cpp
rename to pcbnew/specctra_import_export/specctra_import.cpp
index 9e0bd786a1..3170edc86a 100644
--- a/pcbnew/specctra_import.cpp
+++ b/pcbnew/specctra_import_export/specctra_import.cpp
@@ -47,7 +47,7 @@
 #include <connectivity_data.h>
 #include <view/view.h>
 
-#include <specctra.h>
+#include "specctra.h"
 
 
 using namespace DSN;
diff --git a/pcbnew/specctra_test.cpp b/pcbnew/specctra_import_export/specctra_test.cpp
similarity index 99%
rename from pcbnew/specctra_test.cpp
rename to pcbnew/specctra_import_export/specctra_test.cpp
index 0e0733cb45..3f987e33c4 100644
--- a/pcbnew/specctra_test.cpp
+++ b/pcbnew/specctra_import_export/specctra_test.cpp
@@ -34,7 +34,7 @@
 #include <cstdarg>
 #include <cstdio>
 
-#include <specctra.h>
+#include "specctra.h"
 #include <common.h>