From b05361b3baa804a2c67e74dbd66828cb8517ed91 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Fri, 1 Sep 2017 22:47:31 +0200 Subject: Switched to Makefiles. --- src/CMakeLists.txt | 11 ----------- src/Makefile | 30 ++++++++++++++++++++++++++++++ src/error/CMakeLists.txt | 6 ------ src/irc/CMakeLists.txt | 11 ----------- src/irc/Makefile | 1 + src/meta_net/CMakeLists.txt | 9 --------- src/meta_net/Makefile | 1 + src/parameters/CMakeLists.txt | 7 ------- src/parameters/Makefile | 1 + 9 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 src/CMakeLists.txt create mode 100644 src/Makefile delete mode 100644 src/error/CMakeLists.txt delete mode 100644 src/irc/CMakeLists.txt create mode 120000 src/irc/Makefile delete mode 100644 src/meta_net/CMakeLists.txt create mode 120000 src/meta_net/Makefile delete mode 100644 src/parameters/CMakeLists.txt create mode 120000 src/parameters/Makefile (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 5d1adf6..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_subdirectory(error) -add_subdirectory(parameters) -add_subdirectory(meta_net) -add_subdirectory(irc) - -set( - SRC_FILES ${SRC_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/main.c -) - -set(SRC_FILES ${SRC_FILES} PARENT_SCOPE) diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..8ffa1ab --- /dev/null +++ b/src/Makefile @@ -0,0 +1,30 @@ +SUBCOMPONENTS = $(dir $(filter-out "./Makefile",$(wildcard ./*/Makefile))) +SUBCOMPONENTS_EXPORT = $(addsuffix /export.a,$(SUBCOMPONENTS)) +################################################################################ +SRC_FILES = $(wildcard ./*.c) +OBJ_FILES = $(SRC_FILES:.c=.o) +DEP_FILES = $(SRC_FILES:.c=.d) +################################################################################ +build: export.a + +export.a: $(OBJ_FILES) $(SUBCOMPONENTS_EXPORT) + ar -crT $@ $^ + +$(SUBCOMPONENTS_EXPORT): + $(MAKE) -C $(dir $@) export.a + +clean: + rm -f $(OBJ_FILES) + rm -f $(DEP_FILES) + rm -f export.a + for subcmp in $(SUBCOMPONENTS) ; do \ + $(MAKE) -C $$subcmp clean ; \ + done +################################################################################ +%.d: %.c + @set -e; rm -f $@; \ + $(CC) -M $(CPPFLAGS) $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ + +include $(DEP_FILES) diff --git a/src/error/CMakeLists.txt b/src/error/CMakeLists.txt deleted file mode 100644 index fa07534..0000000 --- a/src/error/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set( - SRC_FILES ${SRC_FILES} -) - -set(SRC_FILES ${SRC_FILES} PARENT_SCOPE) - diff --git a/src/irc/CMakeLists.txt b/src/irc/CMakeLists.txt deleted file mode 100644 index b037d15..0000000 --- a/src/irc/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set( - SRC_FILES ${SRC_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/irc.c - ${CMAKE_CURRENT_SOURCE_DIR}/irc_handle_connected.c - ${CMAKE_CURRENT_SOURCE_DIR}/irc_handle_dcc_events.c - ${CMAKE_CURRENT_SOURCE_DIR}/irc_receive.c - ${CMAKE_CURRENT_SOURCE_DIR}/irc_select.c - ${CMAKE_CURRENT_SOURCE_DIR}/irc_send.c -) - -set(SRC_FILES ${SRC_FILES} PARENT_SCOPE) diff --git a/src/irc/Makefile b/src/irc/Makefile new file mode 120000 index 0000000..d0b0e8e --- /dev/null +++ b/src/irc/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/meta_net/CMakeLists.txt b/src/meta_net/CMakeLists.txt deleted file mode 100644 index ca047c3..0000000 --- a/src/meta_net/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set( - SRC_FILES ${SRC_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/meta_net.c - ${CMAKE_CURRENT_SOURCE_DIR}/meta_net_handle_reply.c - ${CMAKE_CURRENT_SOURCE_DIR}/meta_net_select.c - ${CMAKE_CURRENT_SOURCE_DIR}/meta_net_try_request.c -) - -set(SRC_FILES ${SRC_FILES} PARENT_SCOPE) diff --git a/src/meta_net/Makefile b/src/meta_net/Makefile new file mode 120000 index 0000000..d0b0e8e --- /dev/null +++ b/src/meta_net/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/parameters/CMakeLists.txt b/src/parameters/CMakeLists.txt deleted file mode 100644 index 2aa7ece..0000000 --- a/src/parameters/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set( - SRC_FILES ${SRC_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/parameters.c - ${CMAKE_CURRENT_SOURCE_DIR}/parameters_getters.c -) -set(SRC_FILES ${SRC_FILES} PARENT_SCOPE) - diff --git a/src/parameters/Makefile b/src/parameters/Makefile new file mode 120000 index 0000000..d0b0e8e --- /dev/null +++ b/src/parameters/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file -- cgit v1.2.3-70-g09d2