From 9dec1223cae7e19647c136331ea4fe7df615c85d Mon Sep 17 00:00:00 2001
From: Michael Uleysky <uleysky@poi.dvo.ru>
Date: Fri, 30 Oct 2015 13:09:25 +1000
Subject: [PATCH] Gmt module: Rename all files to begin with modgmt_

---
 modules/gmt/ModuleSetup.cmake                  |  4 ++--
 modules/gmt/makemod                            | 18 +++++++++---------
 ...olortransform.h => modgmt_colortransform.h} |  0
 ...ter_headfoot.l => modgmt_filter_headfoot.l} |  0
 .../gmt/{filters.cpp => modgmt_filters.cpp}    |  4 ++--
 modules/gmt/{filters.h => modgmt_filters.h}    |  0
 modules/gmt/modgmt_internals.h                 |  2 +-
 modules/gmt/modgmt_structs.h                   |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename modules/gmt/{colortransform.h => modgmt_colortransform.h} (100%)
 rename modules/gmt/{gmt_filter_headfoot.l => modgmt_filter_headfoot.l} (100%)
 rename modules/gmt/{filters.cpp => modgmt_filters.cpp} (88%)
 rename modules/gmt/{filters.h => modgmt_filters.h} (100%)

diff --git a/modules/gmt/ModuleSetup.cmake b/modules/gmt/ModuleSetup.cmake
index 299146b..915f0b5 100644
--- a/modules/gmt/ModuleSetup.cmake
+++ b/modules/gmt/ModuleSetup.cmake
@@ -1,6 +1,6 @@
 find_package(FLEX REQUIRED)
-FLEX_TARGET(GMT_hfScanner ${moddir}/gmt_filter_headfoot.l ${CMAKE_CURRENT_BINARY_DIR}/gmt_filter_headfoot.cpp COMPILE_FLAGS "--header-file=${CMAKE_CURRENT_BINARY_DIR}/gmt_filter_headfoot.h")
-set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES gmt_filter_headfoot.h)
+FLEX_TARGET(GMT_hfScanner ${moddir}/modgmt_filter_headfoot.l ${CMAKE_CURRENT_BINARY_DIR}/modgmt_filter_headfoot.cpp COMPILE_FLAGS "--header-file=${CMAKE_CURRENT_BINARY_DIR}/modgmt_filter_headfoot.h")
+set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES modgmt_filter_headfoot.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(GMT REQUIRED)
diff --git a/modules/gmt/makemod b/modules/gmt/makemod
index 831bc10..c1cb79b 100644
--- a/modules/gmt/makemod
+++ b/modules/gmt/makemod
@@ -1,6 +1,6 @@
 MODLIBS+=-lgmt
 
-GMT_FLSOURCE=gmt_filter_headfoot.cpp
+GMT_FLSOURCE=modgmt_filter_headfoot.cpp
 GMT_FLHEADERS=$(subst .cpp,.h,$(GMT_FLSOURCE))
 
 ifeq ($(subst ,$(GMT_FLSOURCE),$(SOURCE)),$(SOURCE))
@@ -10,13 +10,13 @@ MODHEADERS+=modules/gmt/$(GMT_FLHEADERS)
 endif
 
 ifdef MODULE
-filters.d: gmt_filter_headfoot.h
+modgmt_filters.d: modgmt_filter_headfoot.h
 
-gmt_filter_headfoot.cpp: gmt_filter_headfoot.l
-		 flex -o $@ --header-file=gmt_filter_headfoot.h $<
-		 [ -f gmt_filter_headfoot.h ] && touch gmt_filter_headfoot.h
+modgmt_filter_headfoot.cpp: modgmt_filter_headfoot.l
+		 flex -o $@ --header-file=modgmt_filter_headfoot.h $<
+		 [ -f modgmt_filter_headfoot.h ] && touch modgmt_filter_headfoot.h
 
-gmt_filter_headfoot.h: gmt_filter_headfoot.l gmt_filter_headfoot.cpp
+modgmt_filter_headfoot.h: modgmt_filter_headfoot.l modgmt_filter_headfoot.cpp
 
 .PHONY: gmt_clean
 
@@ -27,9 +27,9 @@ gmt_clean:
 
 else
 
-modules/gmt/gmt_filter_headfoot.cpp: modules/gmt/gmt_filter_headfoot.l
-		 make -C modules/gmt -f ../../Makefile MODULE=gmt gmt_filter_headfoot.cpp
+modules/gmt/modgmt_filter_headfoot.cpp: modules/gmt/modgmt_filter_headfoot.l
+		 make -C modules/gmt -f ../../Makefile MODULE=gmt modgmt_filter_headfoot.cpp
 
-modules/gmt/gmt_filter_headfoot.h: modules/gmt/gmt_filter_headfoot.cpp
+modules/gmt/modgmt_filter_headfoot.h: modules/gmt/modgmt_filter_headfoot.cpp
 
 endif
diff --git a/modules/gmt/colortransform.h b/modules/gmt/modgmt_colortransform.h
similarity index 100%
rename from modules/gmt/colortransform.h
rename to modules/gmt/modgmt_colortransform.h
diff --git a/modules/gmt/gmt_filter_headfoot.l b/modules/gmt/modgmt_filter_headfoot.l
similarity index 100%
rename from modules/gmt/gmt_filter_headfoot.l
rename to modules/gmt/modgmt_filter_headfoot.l
diff --git a/modules/gmt/filters.cpp b/modules/gmt/modgmt_filters.cpp
similarity index 88%
rename from modules/gmt/filters.cpp
rename to modules/gmt/modgmt_filters.cpp
index c602c38..e4c1059 100644
--- a/modules/gmt/filters.cpp
+++ b/modules/gmt/modgmt_filters.cpp
@@ -1,5 +1,5 @@
-#include "filters.h"
-#include "gmt_filter_headfoot.h"
+#include "modgmt_filters.h"
+#include "modgmt_filter_headfoot.h"
 
 int gmt_filter_default(int fd, std::string* res, void* p)
 {
diff --git a/modules/gmt/filters.h b/modules/gmt/modgmt_filters.h
similarity index 100%
rename from modules/gmt/filters.h
rename to modules/gmt/modgmt_filters.h
diff --git a/modules/gmt/modgmt_internals.h b/modules/gmt/modgmt_internals.h
index d2fac2a..e8611cc 100644
--- a/modules/gmt/modgmt_internals.h
+++ b/modules/gmt/modgmt_internals.h
@@ -2,7 +2,7 @@
 #define MODGMT_INTERNALS_H
 #include <gmt.h>
 #include <string.h>
-#include "filters.h"
+#include "modgmt_filters.h"
 #include "modgmt_structs.h"
 
 // here we save header and footer of gmt-produced eps files
diff --git a/modules/gmt/modgmt_structs.h b/modules/gmt/modgmt_structs.h
index b459d8c..fadfa4b 100644
--- a/modules/gmt/modgmt_structs.h
+++ b/modules/gmt/modgmt_structs.h
@@ -598,7 +598,7 @@ struct gmt_color
 
  // Transformation functions
  private:
-#include "colortransform.h"
+#include "modgmt_colortransform.h"
 };