Browse Source

Gmt module: Rename all files to begin with modgmt_

ObjPtr
Michael Uleysky 9 years ago
parent
commit
9dec1223ca
  1. 4
      modules/gmt/ModuleSetup.cmake
  2. 18
      modules/gmt/makemod
  3. 0
      modules/gmt/modgmt_colortransform.h
  4. 0
      modules/gmt/modgmt_filter_headfoot.l
  5. 4
      modules/gmt/modgmt_filters.cpp
  6. 0
      modules/gmt/modgmt_filters.h
  7. 2
      modules/gmt/modgmt_internals.h
  8. 2
      modules/gmt/modgmt_structs.h

4
modules/gmt/ModuleSetup.cmake

@ -1,6 +1,6 @@
find_package(FLEX REQUIRED) 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") 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 gmt_filter_headfoot.h) set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES modgmt_filter_headfoot.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
find_package(GMT REQUIRED) find_package(GMT REQUIRED)

18
modules/gmt/makemod

@ -1,6 +1,6 @@
MODLIBS+=-lgmt MODLIBS+=-lgmt
GMT_FLSOURCE=gmt_filter_headfoot.cpp GMT_FLSOURCE=modgmt_filter_headfoot.cpp
GMT_FLHEADERS=$(subst .cpp,.h,$(GMT_FLSOURCE)) GMT_FLHEADERS=$(subst .cpp,.h,$(GMT_FLSOURCE))
ifeq ($(subst ,$(GMT_FLSOURCE),$(SOURCE)),$(SOURCE)) ifeq ($(subst ,$(GMT_FLSOURCE),$(SOURCE)),$(SOURCE))
@ -10,13 +10,13 @@ MODHEADERS+=modules/gmt/$(GMT_FLHEADERS)
endif endif
ifdef MODULE ifdef MODULE
filters.d: gmt_filter_headfoot.h modgmt_filters.d: modgmt_filter_headfoot.h
gmt_filter_headfoot.cpp: gmt_filter_headfoot.l modgmt_filter_headfoot.cpp: modgmt_filter_headfoot.l
flex -o $@ --header-file=gmt_filter_headfoot.h $< flex -o $@ --header-file=modgmt_filter_headfoot.h $<
[ -f gmt_filter_headfoot.h ] && touch gmt_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 .PHONY: gmt_clean
@ -27,9 +27,9 @@ gmt_clean:
else else
modules/gmt/gmt_filter_headfoot.cpp: modules/gmt/gmt_filter_headfoot.l modules/gmt/modgmt_filter_headfoot.cpp: modules/gmt/modgmt_filter_headfoot.l
make -C modules/gmt -f ../../Makefile MODULE=gmt gmt_filter_headfoot.cpp 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 endif

0
modules/gmt/colortransform.h → modules/gmt/modgmt_colortransform.h

0
modules/gmt/gmt_filter_headfoot.l → modules/gmt/modgmt_filter_headfoot.l

4
modules/gmt/filters.cpp → modules/gmt/modgmt_filters.cpp

@ -1,5 +1,5 @@
#include "filters.h" #include "modgmt_filters.h"
#include "gmt_filter_headfoot.h" #include "modgmt_filter_headfoot.h"
int gmt_filter_default(int fd, std::string* res, void* p) int gmt_filter_default(int fd, std::string* res, void* p)
{ {

0
modules/gmt/filters.h → modules/gmt/modgmt_filters.h

2
modules/gmt/modgmt_internals.h

@ -2,7 +2,7 @@
#define MODGMT_INTERNALS_H #define MODGMT_INTERNALS_H
#include <gmt.h> #include <gmt.h>
#include <string.h> #include <string.h>
#include "filters.h" #include "modgmt_filters.h"
#include "modgmt_structs.h" #include "modgmt_structs.h"
// here we save header and footer of gmt-produced eps files // here we save header and footer of gmt-produced eps files

2
modules/gmt/modgmt_structs.h

@ -598,7 +598,7 @@ struct gmt_color
// Transformation functions // Transformation functions
private: private:
#include "colortransform.h" #include "modgmt_colortransform.h"
}; };

Loading…
Cancel
Save