From 19934970b26428bd3b1db81a4e3d9fdddcd118e9 Mon Sep 17 00:00:00 2001 From: Norbert Podhorszki Date: Tue, 15 Mar 2016 17:08:24 -0400 Subject: [PATCH] Rename list_method* utilities to adios_list_method* --- configure.ac | 2 +- utils/CMakeLists.txt | 2 +- utils/Makefile.am | 2 +- .../.gitignore | 0 utils/adios_list_methods/CMakeLists.txt | 28 +++++++++++++++ utils/adios_list_methods/Makefile.am | 34 +++++++++++++++++++ .../adios_list_methods.c} | 0 utils/list_methods/CMakeLists.txt | 28 --------------- utils/list_methods/Makefile.am | 34 ------------------- 9 files changed, 65 insertions(+), 65 deletions(-) rename utils/{list_methods => adios_list_methods}/.gitignore (100%) create mode 100644 utils/adios_list_methods/CMakeLists.txt create mode 100644 utils/adios_list_methods/Makefile.am rename utils/{list_methods/list_methods.c => adios_list_methods/adios_list_methods.c} (100%) delete mode 100644 utils/list_methods/CMakeLists.txt delete mode 100644 utils/list_methods/Makefile.am diff --git a/configure.ac b/configure.ac index 568d9528c..ece0a3d8b 100644 --- a/configure.ac +++ b/configure.ac @@ -844,7 +844,7 @@ AC_CONFIG_FILES([Makefile utils/bpls/Makefile utils/bpdiff/Makefile utils/bp2bp/Makefile - utils/list_methods/Makefile + utils/adios_list_methods/Makefile utils/bpmeta/Makefile utils/bprecover/Makefile utils/fastbit/Makefile diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 6939c14ec..c82bf5bf4 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(bpls) add_subdirectory(bpdiff) add_subdirectory(bpmeta) add_subdirectory(bprecover) -add_subdirectory(list_methods) +add_subdirectory(adios_list_methods) if(BUILD_WRITE) add_subdirectory(adios_lint) diff --git a/utils/Makefile.am b/utils/Makefile.am index e6d7bb6b6..39acf4ff0 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= gpp bpdump bp2ascii bpsplit bpls bpdiff skeldump list_methods bpmeta bprecover +SUBDIRS= gpp bpdump bp2ascii bpsplit bpls bpdiff skeldump adios_list_methods bpmeta bprecover if BUILD_WRITE SUBDIRS += adios_lint bp2bp diff --git a/utils/list_methods/.gitignore b/utils/adios_list_methods/.gitignore similarity index 100% rename from utils/list_methods/.gitignore rename to utils/adios_list_methods/.gitignore diff --git a/utils/adios_list_methods/CMakeLists.txt b/utils/adios_list_methods/CMakeLists.txt new file mode 100644 index 000000000..92d35e8b6 --- /dev/null +++ b/utils/adios_list_methods/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories(${PROJECT_SOURCE_DIR}/src) +include_directories(${PROJECT_SOURCE_DIR}/src/core) +include_directories(${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/src ${PROJECT_BINARY_DIR}/src/public) +include_directories(${PROJECT_SOURCE_DIR}/utils/adios_list_methods) +link_directories(${PROJECT_BINARY_DIR}/utils/adios_list_methods) + +if(BUILD_WRITE) + add_executable(adios_list_methods adios_list_methods.c) + target_link_libraries(adios_list_methods adios ${ADIOSLIB_LDADD} ${MPI_C_LIBRARIES}) + set_target_properties(adios_list_methods PROPERTIES COMPILE_FLAGS "${MACRODEFFLAG}WRITE ${ADIOSLIB_CPPFLAGS} ${ADIOSLIB_CFLAGS} ${ADIOSLIB_EXTRA_CPPFLAGS} ${MPI_C_COMPILE_FLAGS}") + + if(MPI_LINK_FLAGS) + set_target_properties(adios_list_methods PROPERTIES LINK_FLAGS "${MPI_C_LINK_FLAGS}") + endif() + + install(PROGRAMS ${PROJECT_BINARY_DIR}/utils/adios_list_methods/adios_list_methods DESTINATION ${bindir}) +endif(BUILD_WRITE) + +add_executable(adios_list_methods_readonly adios_list_methods.c) +target_link_libraries(adios_list_methods_readonly adiosread ${ADIOSREADLIB_LDADD} ${MPI_C_LIBRARIES}) +set_target_properties(adios_list_methods_readonly PROPERTIES COMPILE_FLAGS +"${ADIOSREADLIB_CPPFLAGS} ${ADIOSREADLIB_CFLAGS} ${ADIOSREADLIB_EXTRA_CPPFLAGS} ${MPI_C_COMPILE_FLAGS}") + +if(MPI_LINK_FLAGS) + set_target_properties(adios_list_methods_readonly PROPERTIES LINK_FLAGS "${MPI_C_LINK_FLAGS}") +endif() + +install(PROGRAMS ${PROJECT_BINARY_DIR}/utils/adios_list_methods/adios_list_methods_readonly DESTINATION ${bindir}) diff --git a/utils/adios_list_methods/Makefile.am b/utils/adios_list_methods/Makefile.am new file mode 100644 index 000000000..7b3e4e641 --- /dev/null +++ b/utils/adios_list_methods/Makefile.am @@ -0,0 +1,34 @@ +AM_CPPFLAGS = $(all_includes) +AM_CPPFLAGS += -I$(top_builddir)/src -I$(top_builddir)/src/public -I$(top_srcdir)/src -I$(top_srcdir)/src/core + +AUTOMAKE_OPTIONS = no-dependencies + +bin_PROGRAMS = adios_list_methods_readonly adios_list_methods_readonly_nompi + +if BUILD_WRITE +bin_PROGRAMS += adios_list_methods adios_list_methods_nompi +adios_list_methods_SOURCES = adios_list_methods.c +adios_list_methods_CPPFLAGS = $(AM_CPPFLAGS) ${MACRODEFFLAG}WRITE $(ADIOSLIB_CPPFLAGS) $(ADIOSLIB_CFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) +adios_list_methods_LDFLAGS = $(ADIOSLIB_LDFLAGS) +adios_list_methods_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) + +adios_list_methods_nompi_SOURCES = adios_list_methods.c +adios_list_methods_nompi_CPPFLAGS = $(AM_CPPFLAGS) ${MACRODEFFLAG}WRITE $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) +adios_list_methods_nompi_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) +adios_list_methods_nompi_LDADD = $(top_builddir)/src/libadios_nompi.a $(ADIOSLIB_SEQ_LDADD) +endif + +adios_list_methods_readonly_SOURCES = adios_list_methods.c +adios_list_methods_readonly_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSREADLIB_CPPFLAGS) $(ADIOSREADLIB_CFLAGS) +adios_list_methods_readonly_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +adios_list_methods_readonly_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) + +adios_list_methods_readonly_nompi_SOURCES = adios_list_methods.c +adios_list_methods_readonly_nompi_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSREADLIB_SEQ_CPPFLAGS) $(ADIOSREADLIB_SEQ_CFLAGS) +adios_list_methods_readonly_nompi_LDFLAGS = $(ADIOSREADLIB_SEQ_LDFLAGS) +adios_list_methods_readonly_nompi_LDADD = $(top_builddir)/src/libadiosread_nompi.a $(ADIOSREADLIB_SEQ_LDADD) + +CC=$(MPICC) +CXX=$(MPICXX) + + diff --git a/utils/list_methods/list_methods.c b/utils/adios_list_methods/adios_list_methods.c similarity index 100% rename from utils/list_methods/list_methods.c rename to utils/adios_list_methods/adios_list_methods.c diff --git a/utils/list_methods/CMakeLists.txt b/utils/list_methods/CMakeLists.txt deleted file mode 100644 index 1d425873a..000000000 --- a/utils/list_methods/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -include_directories(${PROJECT_SOURCE_DIR}/src) -include_directories(${PROJECT_SOURCE_DIR}/src/core) -include_directories(${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/src ${PROJECT_BINARY_DIR}/src/public) -include_directories(${PROJECT_SOURCE_DIR}/utils/list_methods) -link_directories(${PROJECT_BINARY_DIR}/utils/list_methods) - -if(BUILD_WRITE) - add_executable(list_methods list_methods.c) - target_link_libraries(list_methods adios ${ADIOSLIB_LDADD} ${MPI_C_LIBRARIES}) - set_target_properties(list_methods PROPERTIES COMPILE_FLAGS "${MACRODEFFLAG}WRITE ${ADIOSLIB_CPPFLAGS} ${ADIOSLIB_CFLAGS} ${ADIOSLIB_EXTRA_CPPFLAGS} ${MPI_C_COMPILE_FLAGS}") - - if(MPI_LINK_FLAGS) - set_target_properties(list_methods PROPERTIES LINK_FLAGS "${MPI_C_LINK_FLAGS}") - endif() - - install(PROGRAMS ${PROJECT_BINARY_DIR}/utils/list_methods/list_methods DESTINATION ${bindir}) -endif(BUILD_WRITE) - -add_executable(list_methods_readonly list_methods.c) -target_link_libraries(list_methods_readonly adiosread ${ADIOSREADLIB_LDADD} ${MPI_C_LIBRARIES}) -set_target_properties(list_methods_readonly PROPERTIES COMPILE_FLAGS -"${ADIOSREADLIB_CPPFLAGS} ${ADIOSREADLIB_CFLAGS} ${ADIOSREADLIB_EXTRA_CPPFLAGS} ${MPI_C_COMPILE_FLAGS}") - -if(MPI_LINK_FLAGS) - set_target_properties(list_methods_readonly PROPERTIES LINK_FLAGS "${MPI_C_LINK_FLAGS}") -endif() - -install(PROGRAMS ${PROJECT_BINARY_DIR}/utils/list_methods/list_methods_readonly DESTINATION ${bindir}) diff --git a/utils/list_methods/Makefile.am b/utils/list_methods/Makefile.am deleted file mode 100644 index 674cccfed..000000000 --- a/utils/list_methods/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -AM_CPPFLAGS = $(all_includes) -AM_CPPFLAGS += -I$(top_builddir)/src -I$(top_builddir)/src/public -I$(top_srcdir)/src -I$(top_srcdir)/src/core - -AUTOMAKE_OPTIONS = no-dependencies - -bin_PROGRAMS = list_methods_readonly list_methods_readonly_nompi - -if BUILD_WRITE -bin_PROGRAMS += list_methods list_methods_nompi -list_methods_SOURCES = list_methods.c -list_methods_CPPFLAGS = $(AM_CPPFLAGS) ${MACRODEFFLAG}WRITE $(ADIOSLIB_CPPFLAGS) $(ADIOSLIB_CFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) -list_methods_LDFLAGS = $(ADIOSLIB_LDFLAGS) -list_methods_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) - -list_methods_nompi_SOURCES = list_methods.c -list_methods_nompi_CPPFLAGS = $(AM_CPPFLAGS) ${MACRODEFFLAG}WRITE $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) -list_methods_nompi_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) -list_methods_nompi_LDADD = $(top_builddir)/src/libadios_nompi.a $(ADIOSLIB_SEQ_LDADD) -endif - -list_methods_readonly_SOURCES = list_methods.c -list_methods_readonly_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSREADLIB_CPPFLAGS) $(ADIOSREADLIB_CFLAGS) -list_methods_readonly_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) -list_methods_readonly_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) - -list_methods_readonly_nompi_SOURCES = list_methods.c -list_methods_readonly_nompi_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSREADLIB_SEQ_CPPFLAGS) $(ADIOSREADLIB_SEQ_CFLAGS) -list_methods_readonly_nompi_LDFLAGS = $(ADIOSREADLIB_SEQ_LDFLAGS) -list_methods_readonly_nompi_LDADD = $(top_builddir)/src/libadiosread_nompi.a $(ADIOSREADLIB_SEQ_LDADD) - -CC=$(MPICC) -CXX=$(MPICXX) - -