stubs and cmake formatting

2025-07-29 08:21:15 +03:00 · 2025-05-20 02:18:54 +00:00
parent 2036e521c7
commit 6db2dc668f
87 changed files with 1186 additions and 1039 deletions
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@ -1,4 +1,3 @@
-
 add_subdirectory(dbbuilder)
 add_subdirectory(editem)
 add_subdirectory(dbloadxml)
--- a/tools/cfread/CMakeLists.txt
+++ b/tools/cfread/CMakeLists.txt
@ -1,58 +1,77 @@
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})

-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(cfread_SRCS cfread.cpp)

 kde4_add_executable(cfread ${cfread_SRCS})

-target_link_libraries(cfread ${KDE4_KDECORE_LIBS} pthread writeengine brm rwlock messageqcpp dl configcpp xml2 loggingcpp cacheutils boost_idb pthread rt)
+target_link_libraries(
+    cfread
+    ${KDE4_KDECORE_LIBS}
+    pthread
+    writeengine
+    brm
+    rwlock
+    messageqcpp
+    dl
+    configcpp
+    xml2
+    loggingcpp
+    cacheutils
+    boost_idb
+    pthread
+    rt
+)

 install(TARGETS cfread ${INSTALL_TARGETS_DEFAULT_ARGS})

-
-########### next target ###############
+# ########## next target ###############

 set(mtread_SRCS mtread.cpp)

 kde4_add_executable(mtread ${mtread_SRCS})

-target_link_libraries(mtread ${KDE4_KDECORE_LIBS} pthread writeengine brm rwlock messageqcpp dl configcpp xml2 loggingcpp cacheutils boost_idb pthread rt)
+target_link_libraries(
+    mtread
+    ${KDE4_KDECORE_LIBS}
+    pthread
+    writeengine
+    brm
+    rwlock
+    messageqcpp
+    dl
+    configcpp
+    xml2
+    loggingcpp
+    cacheutils
+    boost_idb
+    pthread
+    rt
+)

 install(TARGETS mtread ${INSTALL_TARGETS_DEFAULT_ARGS})

+# ########## install files ###############

-########### install files ###############
+# original Makefile.am contents follow:

-
-
-
-#original Makefile.am contents follow:
-
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
+# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in
 #
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = cfread mtread
-#cfread_SOURCES = cfread.cpp
-#cfread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#cfread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS)
-#mtread_SOURCES = mtread.cpp
-#mtread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#mtread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS)
+# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags)
+# bin_PROGRAMS = cfread mtread cfread_SOURCES = cfread.cpp cfread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
+# cfread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2
+# -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS) mtread_SOURCES = mtread.cpp mtread_CPPFLAGS =
+# @idb_common_includes@ $(AM_CPPFLAGS) mtread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock
+# -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS)
 #
-#test:
+# test:
 #
-#coverage:
+# coverage:
 #
-#leakcheck:
+# leakcheck:
 #
-#docs:
+# docs:
 #
-#bootstrap: install-data-am
+# bootstrap: install-data-am
 #
--- a/tools/clearShm/CMakeLists.txt
+++ b/tools/clearShm/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(clearShm_SRCS main.cpp)

@ -10,5 +8,8 @@ add_executable(clearShm ${clearShm_SRCS})

 target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})

-install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS clearShm
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/cleartablelock/CMakeLists.txt
+++ b/tools/cleartablelock/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(cleartablelock_SRCS cleartablelock.cpp cleartablelockthread.cpp)

@ -10,5 +8,8 @@ add_executable(cleartablelock ${cleartablelock_SRCS})

 target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})

-install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS cleartablelock
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/configMgt/CMakeLists.txt
+++ b/tools/configMgt/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(autoConfigure_SRCS autoConfigure.cpp)

@ -10,4 +8,4 @@ add_executable(autoConfigure ${autoConfigure_SRCS})

 target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})

-#install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
+# install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
--- a/tools/cplogger/CMakeLists.txt
+++ b/tools/cplogger/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(cplogger_SRCS main.cpp)

@ -10,5 +8,8 @@ add_executable(cplogger ${cplogger_SRCS})

 target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})

-install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS cplogger
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/dbbuilder/CMakeLists.txt
+++ b/tools/dbbuilder/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(dbbuilder_SRCS dbbuilder.cpp systemcatalog.cpp)

@ -10,5 +8,8 @@ add_executable(dbbuilder ${dbbuilder_SRCS})

 target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})

-install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS dbbuilder
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/dbloadxml/CMakeLists.txt
+++ b/tools/dbloadxml/CMakeLists.txt
@ -1,7 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-########### next target ###############
+# ########## next target ###############

 set(dbload_STAT_SRCS inputmgr.cpp)

@ -9,7 +8,7 @@ add_library(dbload STATIC ${dbload_STAT_SRCS})

 add_dependencies(dbload loggingcpp)

-########### next target ###############
+# ########## next target ###############

 set(colxml_SRCS colxml.cpp)

@ -17,5 +16,8 @@ add_executable(colxml ${colxml_SRCS})

 target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${ENGINE_WRITE_LIBS})

-install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS colxml
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/ddlcleanup/CMakeLists.txt
+++ b/tools/ddlcleanup/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(ddlcleanup_SRCS ddlcleanup.cpp)

@ -10,5 +8,8 @@ add_executable(ddlcleanup ${ddlcleanup_SRCS})

 target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} ddlcleanuputil)

-install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS ddlcleanup
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/ddldriver/CMakeLists.txt
+++ b/tools/ddldriver/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})

-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(ddldriver_SRCS ddldriver.cpp)

@ -12,50 +10,34 @@ target_link_libraries(ddldriver ${KDE4_KDECORE_LIBS})

 install(TARGETS ddldriver ${INSTALL_TARGETS_DEFAULT_ARGS})

+# ########## install files ###############

-########### install files ###############
+# original Makefile.am contents follow:

-
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
+# Copyright (C) 2014 InfiniDB, Inc.
 #
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
+# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; version 2 of the License.
 #
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = ddldriver
-#ddldriver_SOURCES = ddldriver.cpp
-#ddldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#ddldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS)
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-#test:
+# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-#coverage:
+# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in
 #
-#leakcheck:
+# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags)
+# bin_PROGRAMS = ddldriver ddldriver_SOURCES = ddldriver.cpp ddldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
+# ddldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS)
 #
-#docs:
+# test:
 #
-#bootstrap: install-data-am
+# coverage:
+#
+# leakcheck:
+#
+# docs:
+#
+# bootstrap: install-data-am
 #
--- a/tools/dmldriver/CMakeLists.txt
+++ b/tools/dmldriver/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})

-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(dmldriver_SRCS dmldriver.cpp tpchrf2.cpp dmlif.cpp)

@ -12,50 +10,35 @@ target_link_libraries(dmldriver ${KDE4_KDECORE_LIBS})

 install(TARGETS dmldriver ${INSTALL_TARGETS_DEFAULT_ARGS})

+# ########## install files ###############

-########### install files ###############
+# original Makefile.am contents follow:

-
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
+# Copyright (C) 2014 InfiniDB, Inc.
 #
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
+# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; version 2 of the License.
 #
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = dmldriver
-#dmldriver_SOURCES = dmldriver.cpp tpchrf2.cpp dmlif.cpp
-#dmldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#dmldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS)
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-#test:
+# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-#coverage:
+# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in
 #
-#leakcheck:
+# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags)
+# bin_PROGRAMS = dmldriver dmldriver_SOURCES = dmldriver.cpp tpchrf2.cpp dmlif.cpp dmldriver_CPPFLAGS =
+# @idb_common_includes@ $(AM_CPPFLAGS) dmldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@
+# @netsnmp_libs@ $(AM_LDFLAGS)
 #
-#docs:
+# test:
 #
-#bootstrap: install-data-am
+# coverage:
+#
+# leakcheck:
+#
+# docs:
+#
+# bootstrap: install-data-am
 #
--- a/tools/editem/CMakeLists.txt
+++ b/tools/editem/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(editem_SRCS editem.cpp)

@ -10,5 +8,8 @@ add_executable(editem ${editem_SRCS})

 target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})

-install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS editem
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/getConfig/CMakeLists.txt
+++ b/tools/getConfig/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(getConfig_SRCS main.cpp)

@ -10,5 +8,8 @@ add_executable(mcsGetConfig ${getConfig_SRCS})

 target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})

-install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS mcsGetConfig
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/idbmeminfo/CMakeLists.txt
+++ b/tools/idbmeminfo/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(idbmeminfo_SRCS idbmeminfo.cpp)

@ -10,5 +8,8 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS})

 target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS})

-install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS idbmeminfo
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/passwd/CMakeLists.txt
+++ b/tools/passwd/CMakeLists.txt
@ -1,7 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_COMMON_INCLUDE})

-include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_COMMON_INCLUDE} )
-
-########### next target ###############
+# ########## next target ###############
 set(cspasswd_SRCS cspasswd.cpp secrets.cpp)
 set(cskeys_SRCS cskeys.cpp secrets.cpp)

@ -13,6 +12,13 @@ target_include_directories(cskeys BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR})
 target_link_libraries(cspasswd ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})
 target_link_libraries(cskeys ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})

-install(TARGETS cspasswd DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-install(TARGETS cskeys DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS cspasswd
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
+install(
+    TARGETS cskeys
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/qfe/CMakeLists.txt
+++ b/tools/qfe/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})

-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(QFE_SRCS
    cseputils.cpp
@ -13,7 +11,8 @@ set(QFE_SRCS
    server.cpp
    socketio.cpp
    qfelexer.lpp
-    qfeparser.ypp)
+    qfeparser.ypp
+)

 kde4_add_executable(QFE ${QFE_SRCS})

@ -21,62 +20,36 @@ target_link_libraries(QFE ${KDE4_KDECORE_LIBS})

 install(TARGETS QFE ${INSTALL_TARGETS_DEFAULT_ARGS})

+# ########## install files ###############

-########### install files ###############
+# original Makefile.am contents follow:

-
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
+# Copyright (C) 2014 InfiniDB, Inc.
 #
-## $Id$
-### Process this file with automake to produce Makefile.in
+# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; version 2 of the License.
 #
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#AM_YFLAGS = -d -p qfe
-#AM_LFLAGS = -i -Pqfe -olex.yy.c
-#bin_PROGRAMS = QFE
-#QFE_SOURCES = \
-#cseputils.cpp \
-#ddlstmts.cpp \
-#parsequery.cpp \
-#returnedrows.cpp \
-#sendcsep.cpp \
-#server.cpp \
-#socketio.cpp \
-#qfelexer.lpp \
-#qfeparser.ypp
-#QFE_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#QFE_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_exec_libs@ $(AM_LDFLAGS)
-#BUILT_SOURCES = qfeparser.cpp qfelexer.cpp qfeparser.h
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-#test:
+# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-#coverage:
+# $Id$ Process this file with automake to produce Makefile.in
 #
-#leakcheck:
+# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags)
+# AM_YFLAGS = -d -p qfe AM_LFLAGS = -i -Pqfe -olex.yy.c bin_PROGRAMS = QFE QFE_SOURCES = \ cseputils.cpp \ ddlstmts.cpp
+# \ parsequery.cpp \ returnedrows.cpp \ sendcsep.cpp \ server.cpp \ socketio.cpp \ qfelexer.lpp \ qfeparser.ypp
+# QFE_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) QFE_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@
+# @idb_exec_libs@ $(AM_LDFLAGS) BUILT_SOURCES = qfeparser.cpp qfelexer.cpp qfeparser.h
 #
-#docs:
+# test:
 #
-#bootstrap: install-data-am
+# coverage:
+#
+# leakcheck:
+#
+# docs:
+#
+# bootstrap: install-data-am
 #
--- a/tools/rebuildEM/CMakeLists.txt
+++ b/tools/rebuildEM/CMakeLists.txt
@ -3,4 +3,8 @@ include_directories(${ENGINE_COMMON_INCLUDES})
 set(rebuildEM_SRCS main.cpp rebuildEM.cpp)
 add_executable(mcsRebuildEM ${rebuildEM_SRCS})
 target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_system boost_filesystem)
-install(TARGETS mcsRebuildEM DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS mcsRebuildEM
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/rgprint/CMakeLists.txt
+++ b/tools/rgprint/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(rgprint_SRCS rgprint.cpp)

@ -10,5 +8,8 @@ add_executable(rgprint ${rgprint_SRCS})

 target_link_libraries(rgprint ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})

-install(TARGETS rgprint DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS rgprint
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/sendPlan/CMakeLists.txt
+++ b/tools/sendPlan/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})

-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(sendPlan_SRCS sendplan.cpp)

@ -12,33 +10,23 @@ target_link_libraries(sendPlan ${KDE4_KDECORE_LIBS})

 install(TARGETS sendPlan ${INSTALL_TARGETS_DEFAULT_ARGS})

+# ########## install files ###############

-########### install files ###############
+# original Makefile.am contents follow:

-
-
-
-#original Makefile.am contents follow:
-
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
+# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in
 #
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = sendPlan
-#sendPlan_SOURCES = sendplan.cpp
-#sendPlan_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
-#sendPlan_LDFLAGS = @idb_common_ldflags@ @idb_exec_libs@ $(AM_LDFLAGS)
+# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags)
+# bin_PROGRAMS = sendPlan sendPlan_SOURCES = sendplan.cpp sendPlan_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS)
+# sendPlan_LDFLAGS = @idb_common_ldflags@ @idb_exec_libs@ $(AM_LDFLAGS)
 #
-#test:
+# test:
 #
-#coverage:
+# coverage:
 #
-#leakcheck:
+# leakcheck:
 #
-#docs:
+# docs:
 #
-#bootstrap: install-data-am
+# bootstrap: install-data-am
 #
--- a/tools/setConfig/CMakeLists.txt
+++ b/tools/setConfig/CMakeLists.txt
@ -1,7 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-########### next target ###############
+# ########## next target ###############

 set(setConfig_SRCS main.cpp)

@ -9,5 +8,8 @@ add_executable(mcsSetConfig ${setConfig_SRCS})

 target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})

-install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS mcsSetConfig
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)
--- a/tools/viewtablelock/CMakeLists.txt
+++ b/tools/viewtablelock/CMakeLists.txt
@ -1,8 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-
-########### next target ###############
+# ########## next target ###############

 set(viewtablelock_SRCS viewtablelock.cpp)

@ -10,5 +8,8 @@ add_executable(viewtablelock ${viewtablelock_SRCS})

 target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})

-install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
-
+install(
+    TARGETS viewtablelock
+    DESTINATION ${ENGINE_BINDIR}
+    COMPONENT columnstore-engine
+)