From f740af265576783565f9dabd7b2b5b9f01ef10d9 Mon Sep 17 00:00:00 2001 From: Alberto Fanjul Date: Sat, 29 Oct 2022 01:02:28 +0200 Subject: [PATCH] Clean cmake files --- src/CMakeLists.txt | 24 -------------- src/ctl/CMakeLists.txt | 41 ----------------------- src/dhcp/CMakeLists.txt | 36 -------------------- src/shared/CMakeLists.txt | 32 ------------------ src/wifi/CMakeLists.txt | 33 ------------------- test/CMakeLists.txt | 69 --------------------------------------- 6 files changed, 235 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c4d9a4..c049c12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,27 +13,3 @@ target_link_libraries(miracled m) install(TARGETS miracled DESTINATION bin) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#SUBDIRS = shared wifi dhcp ctl -# -#bin_PROGRAMS = miracled -# -#miracled_SOURCES = \ -# miracled.h \ -# miracled.c -#miracled_CPPFLAGS = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) -#miracled_LDADD = \ -# shared/libmiracle-shared.la \ -# $(DEPS_LIBS) -# diff --git a/src/ctl/CMakeLists.txt b/src/ctl/CMakeLists.txt index 8025da8..234b343 100644 --- a/src/ctl/CMakeLists.txt +++ b/src/ctl/CMakeLists.txt @@ -4,7 +4,6 @@ link_directories( ${GLIB2_LIBRARY_DIRS}) include_directories( ${GLIB2_INCLUDE_DIRS}) find_package(Readline REQUIRED) pkg_check_modules (GLIB2 REQUIRED glib-2.0) -########### next target ############### set(miracle-wifictl_SRCS ctl.h ctl-cli.c @@ -26,7 +25,6 @@ endif(READLINE_FOUND) target_link_libraries(miracle-wifictl miracle-shared) target_link_libraries(miracle-wifictl m) target_link_libraries(miracle-wifictl ${GLIB2_LIBRARIES}) -########### next target ############### set(miracle-sinkctl_SRCS ctl.h ctl-cli.c @@ -53,42 +51,3 @@ endif(READLINE_FOUND) target_link_libraries(miracle-sinkctl miracle-shared) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#bin_PROGRAMS = miracle-wifictl miracle-sinkctl -# -#miracle_wifictl_SOURCES = \ -# ctl.h \ -# ctl-cli.c \ -# ctl-wifi.c \ -# wifictl.c -#miracle_wifictl_CPPFLAGS = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) -#miracle_wifictl_LDADD = \ -# ../shared/libmiracle-shared.la \ -# -lreadline \ -# $(DEPS_LIBS) -# -#miracle_sinkctl_SOURCES = \ -# ctl.h \ -# ctl-cli.c \ -# ctl-sink.c \ -# ctl-wifi.c \ -# sinkctl.c -#miracle_sinkctl_CPPFLAGS = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) -#miracle_sinkctl_LDADD = \ -# ../shared/libmiracle-shared.la \ -# -lreadline \ -# $(DEPS_LIBS) -# -# diff --git a/src/dhcp/CMakeLists.txt b/src/dhcp/CMakeLists.txt index 1e37819..7ae3e30 100644 --- a/src/dhcp/CMakeLists.txt +++ b/src/dhcp/CMakeLists.txt @@ -1,6 +1,3 @@ - -########### next target ############### - set(miracle-dhcp_SRCS dhcp.c gdhcp.h unaligned.h @@ -28,36 +25,3 @@ target_link_libraries(miracle-dhcp miracle-shared) install(TARGETS miracle-dhcp DESTINATION bin) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#bin_PROGRAMS = miracle-dhcp -# -#miracle_dhcp_SOURCES = \ -# dhcp.c \ -# gdhcp.h \ -# unaligned.h \ -# common.h \ -# common.c \ -# ipv4ll.h \ -# ipv4ll.c \ -# client.c \ -# server.c -#miracle_dhcp_CPPFLAGS = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) \ -# $(GDHCP_CFLAGS) -#miracle_dhcp_LDADD = \ -# ../shared/libmiracle-shared.la \ -# $(DEPS_LIBS) \ -# $(GDHCP_LIBS) -# -# -# diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 7cbd283..2dea096 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -17,35 +17,3 @@ set(miracle-shared_SOURCES rtsp.h wpas.c) add_library(miracle-shared STATIC ${miracle-shared_SOURCES}) target_link_libraries (miracle-shared ${SESSION_LIBRARIES}) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#noinst_LTLIBRARIES = libmiracle-shared.la -# -#libmiracle_shared_la_SOURCES = \ -# rtsp.h \ -# rtsp.c \ -# shl_dlist.h \ -# shl_htable.h \ -# shl_htable.c \ -# shl_log.h \ -# shl_log.c \ -# shl_macro.h \ -# shl_ring.h \ -# shl_ring.c \ -# shl_util.h \ -# shl_util.c \ -# util.h \ -# wpas.h \ -# wpas.c -#libmiracle_shared_la_LIBADD = -lsystemd -# -# -# diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt index be6bf7f..5a997aa 100644 --- a/src/wifi/CMakeLists.txt +++ b/src/wifi/CMakeLists.txt @@ -1,6 +1,3 @@ - -########### next target ############### - set(miracle-wifid_SRCS wifid.h wifid.c wifid-dbus.c @@ -20,8 +17,6 @@ target_link_libraries(miracle-wifid miracle-shared) find_package(PkgConfig) pkg_check_modules (GLIB2 REQUIRED glib-2.0) pkg_check_modules (UDEV REQUIRED libudev) -#link_directories( ${UDEV_LIBRARY_DIRS}) -#include_directories( ${UDEV_INCLUDE_DIRS}) target_link_libraries(miracle-wifid ${UDEV_LIBRARIES}) target_link_libraries(miracle-wifid m) link_directories( ${GLIB2_LIBRARY_DIRS}) @@ -30,31 +25,3 @@ target_link_libraries(miracle-wifid ${GLIB2_LIBRARIES}) install(TARGETS miracle-wifid DESTINATION bin) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared) - -########### install files ############### - -#set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-extensions/ ) - - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#bin_PROGRAMS = miracle-wifid -# -#miracle_wifid_SOURCES = \ -# wifid.h \ -# wifid.c \ -# wifid-dbus.c \ -# wifid-link.c \ -# wifid-peer.c \ -# wifid-supplicant.c -#miracle_wifid_CPPFLAGS = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) -#miracle_wifid_LDADD = \ -# ../shared/libmiracle-shared.la \ -# $(DEPS_LIBS) -# diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 56bba94..a896336 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,3 @@ - -########### next target ############### - find_package(PkgConfig) pkg_check_modules (CHECK check) @@ -51,69 +48,3 @@ if(CHECK_FOUND) COMMENT "verify memcheck") endif(CHECK_FOUND) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#include $(top_srcdir)/common.am -#tests = \ -# test_rtsp \ -# test_wpas -# -#if BUILD_HAVE_CHECK -#check_PROGRAMS = $(tests) test_valgrind -#TESTS = $(tests) test_valgrind -#MEMTESTS = $(tests) -#endif -# -#test_sources = \ -# test_common.h -#test_libs = \ -# ../src/shared/libmiracle-shared.la \ -# $(DEPS_LIBS) \ -# $(CHECK_LIBS) -#test_cflags = \ -# $(AM_CPPFLAGS) \ -# $(DEPS_CFLAGS) \ -# $(CHECK_CFLAGS) -# -#test_rtsp_SOURCES = test_rtsp.c $(test_sources) -#test_rtsp_CPPFLAGS = $(test_cflags) -#test_rtsp_LDADD = $(test_libs) -# -#test_valgrind_SOURCES = test_valgrind.c $(test_sources) -#test_valgrind_CPPFLAGS = $(test_cflags) -#test_valgrind_LDADD = $(test_libs) -# -#test_wpas_SOURCES = test_wpas.c $(test_sources) -#test_wpas_CPPFLAGS = $(test_cflags) -#test_wpas_LDADD = $(test_libs) -# -### custom recipes -# -#VALGRIND = CK_FORK=no valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --leak-resolution=high --error-exitcode=1 --suppressions=$(top_builddir)/test.supp -# -## verify that test_valgrind actually leaks data -#memcheck-verify: check -# $(AM_V_GEN)$(VALGRIND) --log-file=/dev/null ./test_valgrind >/dev/null ; test 1 = $$? -# -## run memcheck tests via valgrind -#memcheck: memcheck-verify -# $(AM_V_GEN)for i in $(MEMTESTS) ; do \ -# $(VALGRIND) --log-file=$(top_builddir)/$$i.memlog \ -# $(top_builddir)/$$i >/dev/null || (echo "memcheck failed on: $$i" ; exit 1) ; \ -# done -# -#distcheck-hook: memcheck -#AM_MAKEFLAGS = --no-print-directory -#AUTOMAKE_OPTIONS = color-tests -# -## -## Phony targets -## -# -#.PHONY: memcheck-verify