.clang-format

@@ -1,33 +0,0 @@
-# clang-format is fairly limited, and these rules are approximate:
-#  - array initializers can get terribly mangled with clang-format 12.0,
-#  - sometimes it still aligns with space characters,
-#  - EV_DEFAULT_ and EV_A_ are always taken as identifiers,
-#  - struct name NL { NL ... NL } NL name; is unachievable.
-BasedOnStyle: GNU
-ColumnLimit: 80
-IndentWidth: 4
-TabWidth: 4
-UseTab: ForContinuationAndIndentation
-BreakBeforeBraces: Allman
-SpaceAfterCStyleCast: true
-AlignAfterOpenBracket: DontAlign
-AlignOperands: DontAlign
-AlignConsecutiveMacros: Consecutive
-AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-IndentGotoLabels: false
-
-# IncludeCategories has some potential, but it may also break the build.
-# Note that the documentation says the value should be "Never".
-SortIncludes: false
-
-# This is a compromise, it generally works out aesthetically better.
-BinPackArguments: false
-
-# Unfortunately, this can't be told to align to column 40 or so.
-SpacesBeforeTrailingComments: 2
-
-# liberty-specific macro body wrappers.
-MacroBlockBegin: "BLOCK_START"
-MacroBlockEnd: "BLOCK_END"
-ForEachMacros: ["LIST_FOR_EACH"]

.gitignore

@@ -7,5 +7,3 @@
 /json-rpc-shell.files
 /json-rpc-shell.creator*
 /json-rpc-shell.includes
-/json-rpc-shell.cflags
-/json-rpc-shell.cxxflags

CMakeLists.txt

@@ -26,9 +26,9 @@ find_package (LibEV REQUIRED)
 pkg_check_modules (ncursesw ncursesw)
 
 set (project_libraries ${dependencies_LIBRARIES}
-	${libssl_LIBRARIES} ${LibEV_LIBRARIES})
+	${libssl_LIBRARIES} ${LIBEV_LIBRARIES})
 include_directories (${dependencies_INCLUDE_DIRS}
-	${libssl_INCLUDE_DIRS} ${LibEV_INCLUDE_DIRS})
+	${libssl_INCLUDE_DIRS} ${LIBEV_INCLUDE_DIRS})
 
 # -liconv may or may not be a part of libc
 find_library (iconv_LIBRARIES iconv)

cmake/FindLibEV.cmake

@@ -5,16 +5,14 @@
 
 # Some distributions do add it, though
 find_package (PkgConfig REQUIRED)
-pkg_check_modules (LibEV QUIET libev)
+pkg_check_modules (LIBEV QUIET libev)
 
-set (required_vars LibEV_LIBRARIES)
+if (NOT LIBEV_FOUND)
-if (NOT LibEV_FOUND)
+	find_path (LIBEV_INCLUDE_DIRS ev.h)
-	find_path (LibEV_INCLUDE_DIRS ev.h)
+	find_library (LIBEV_LIBRARIES NAMES ev)
-	find_library (LibEV_LIBRARIES NAMES ev)
-	list (APPEND required_vars LibEV_INCLUDE_DIRS)
-endif ()
 
-include (FindPackageHandleStandardArgs)
+	if (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibEV DEFAULT_MSG ${required_vars})
+		set (LIBEV_FOUND TRUE)
+	endif (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
+endif (NOT LIBEV_FOUND)
 
-mark_as_advanced (LibEV_LIBRARIES LibEV_INCLUDE_DIRS)