From 85d99571661e6483bf4ba6814dd4f97f6a39f8c5 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Wed, 4 Dec 2019 00:54:10 +0100 Subject: Better includes, better Makefile --- Makefile | 4 +--- inc/jo_lowbat.hpp | 10 ---------- src/jo_exec.cpp | 2 ++ src/main.cpp | 6 ++++++ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index f48cb55..a6e035a 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,7 @@ ${NAME}: ${OBJS} @${MKDIR} ${TRGT_DIR} ${CC} ${CFLAGS} -o ${TRGT_DIR}${NAME} ${OBJS} #------------------------------------------------------------------------------# -all: - @${MAKE} -j5 ${NAME} +all: ${NAME} #------------------------------------------------------------------------------# install: all mkdir -p $(DESTDIR)$(PREFIX)/bin @@ -85,7 +84,6 @@ fclean: clean ${RM} ${TRGT_DIR} #------------------------------------------------------------------------------# re: fclean all - ${RM} ${TRGT_DIR} #------------------------------------------------------------------------------# .PHONY: all lowbat clean fclean re install uninstall #==================================== EOF =====================================# diff --git a/inc/jo_lowbat.hpp b/inc/jo_lowbat.hpp index 9d9dfe8..fd00892 100644 --- a/inc/jo_lowbat.hpp +++ b/inc/jo_lowbat.hpp @@ -1,19 +1,9 @@ #ifndef JO_LOWBAT_HPP #define JO_LOWBAT_HPP -#include -#include #include -#include -#include -#include -#include -#include -#include using namespace std; -using namespace this_thread; -using namespace chrono; int jo_notify(const string); int jo_speak (const string); diff --git a/src/jo_exec.cpp b/src/jo_exec.cpp index a97012c..04efb66 100644 --- a/src/jo_exec.cpp +++ b/src/jo_exec.cpp @@ -1,4 +1,6 @@ #include +#include +#include string jo_exec(const char* cmd) { diff --git a/src/main.cpp b/src/main.cpp index 88471e7..71f7147 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,12 @@ #include +#include +#include +#include #include +using namespace this_thread; +using namespace chrono; + int main(int argc, const char *argv[]) { string msg; string acstat; -- cgit v1.2.3