From bd9ebee6274bda0ace1a44ef4489d568ff4923f7 Mon Sep 17 00:00:00 2001 From: Bogomil Vasilev Date: Fri, 16 Feb 2018 15:30:36 +0200 Subject: [PATCH] Introduce src, obj, build, docs & modify Makefile --- Makefile | 34 ++++++++----------- build/.gitkeep | 0 rmps.conf => docs/conf/rmps.conf | 0 .../distribution}/archlinux/PKGBUILD | 2 +- enum_codes => docs/enum_codes | 0 rmpsd.service => docs/systemd/rmpsd.service | 0 obj/.gitkeep | 0 {db_scripts => scripts}/README | 0 {db_scripts => scripts}/init_rmps_db.sh | 0 {db_scripts => scripts}/init_rmps_db.sql | 0 agent_pool.c => src/agent_pool.c | 0 agent_pool.h => src/agent_pool.h | 0 client_pool.c => src/client_pool.c | 0 client_pool.h => src/client_pool.h | 0 confparser.c => src/confparser.c | 0 confparser.h => src/confparser.h | 0 enum_functions.c => src/enum_functions.c | 0 enum_functions.h => src/enum_functions.h | 0 job_queue.c => src/job_queue.c | 0 job_queue.h => src/job_queue.h | 0 log.c => src/log.c | 0 log.h => src/log.h | 0 main.c => src/main.c | 0 protocol.c => src/protocol.c | 0 protocol.h => src/protocol.h | 0 rmps.c => src/rmps.c | 0 rmps.h => src/rmps.h | 0 sql.c => src/sql.c | 0 sql.h => src/sql.h | 0 29 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 build/.gitkeep rename rmps.conf => docs/conf/rmps.conf (100%) rename {distribution => docs/distribution}/archlinux/PKGBUILD (96%) rename enum_codes => docs/enum_codes (100%) rename rmpsd.service => docs/systemd/rmpsd.service (100%) create mode 100644 obj/.gitkeep rename {db_scripts => scripts}/README (100%) rename {db_scripts => scripts}/init_rmps_db.sh (100%) rename {db_scripts => scripts}/init_rmps_db.sql (100%) rename agent_pool.c => src/agent_pool.c (100%) rename agent_pool.h => src/agent_pool.h (100%) rename client_pool.c => src/client_pool.c (100%) rename client_pool.h => src/client_pool.h (100%) rename confparser.c => src/confparser.c (100%) rename confparser.h => src/confparser.h (100%) rename enum_functions.c => src/enum_functions.c (100%) rename enum_functions.h => src/enum_functions.h (100%) rename job_queue.c => src/job_queue.c (100%) rename job_queue.h => src/job_queue.h (100%) rename log.c => src/log.c (100%) rename log.h => src/log.h (100%) rename main.c => src/main.c (100%) rename protocol.c => src/protocol.c (100%) rename protocol.h => src/protocol.h (100%) rename rmps.c => src/rmps.c (100%) rename rmps.h => src/rmps.h (100%) rename sql.c => src/sql.c (100%) rename sql.h => src/sql.h (100%) diff --git a/Makefile b/Makefile index b31a1b9..0557d69 100644 --- a/Makefile +++ b/Makefile @@ -24,23 +24,17 @@ ifndef LDFLAGS LDFLAGS += -Wl,-z,relro,-z,now endif -SOURCES = main.c \ - confparser.c \ - rmps.c \ - enum_functions.c \ - log.c \ - agent_pool.c \ - client_pool.c \ - sql.c \ - job_queue.c +SRCDIR = src +OBJDIR = obj +BUILDDIR = build -OBJECTS = $(SOURCES:.c=.o) +SOURCES := $(wildcard $(SRCDIR)/*.c) +INCLUDES := $(wildcard $(SRCDIR)/*.h) +OBJECTS := $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o) EXECUTABLE = rmpsd INSTALLDIR := $(DESTDIR)/usr/bin -all: $(SOURCES) $(EXECUTABLE) - -$(EXECUTABLE): $(OBJECTS) +$(BUILDDIR)/$(EXECUTABLE): $(OBJECTS) ifeq ($(VERBOSE), yes) $(CC) $(SQLLDFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ else @@ -48,25 +42,25 @@ else @$(CC) $(SQLLDFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ endif -.c.o: +$(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c ifeq ($(VERBOSE), yes) $(CC) $(CFLAGS) $(SQLCFLAGS) -c $< -o $@ else - @echo ' CC $@' + @echo ' CC $<' @$(CC) $(CFLAGS) $(SQLCFLAGS) -c $< -o $@ endif clean: - rm -f $(OBJECTS) $(EXECUTABLE) + rm -f $(OBJECTS) $(BUILDDIR)/$(EXECUTABLE) distclean: rm -f $(OBJECTS) install: - install -m755 -D $(EXECUTABLE) "$(INSTALLDIR)/$(EXECUTABLE)" - install -m644 -D rmps.conf "$(DESTDIR)/etc/rmps/rmps.conf" - install -m644 -D rmpsd.service "$(DESTDIR)/usr/lib/systemd/system/rmpsd.service" - install -m644 -D enum_codes "$(DESTDIR)/usr/lib/rmps/resources/enum_codes" + install -m755 -D $(BUILDDIR)/$(EXECUTABLE) "$(INSTALLDIR)/$(EXECUTABLE)" + install -m644 -D docs/conf/rmps.conf "$(DESTDIR)/etc/rmps/rmps.conf" + install -m644 -D docs/systemd/rmpsd.service "$(DESTDIR)/usr/lib/systemd/system/rmpsd.service" + install -m644 -D docs/enum_codes "$(DESTDIR)/usr/lib/rmps/resources/enum_codes" uninstall: rm -f "$(INSTALLDIR)/$(EXECUTABLE)" diff --git a/build/.gitkeep b/build/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/rmps.conf b/docs/conf/rmps.conf similarity index 100% rename from rmps.conf rename to docs/conf/rmps.conf diff --git a/distribution/archlinux/PKGBUILD b/docs/distribution/archlinux/PKGBUILD similarity index 96% rename from distribution/archlinux/PKGBUILD rename to docs/distribution/archlinux/PKGBUILD index ccdee04..bc681ce 100644 --- a/distribution/archlinux/PKGBUILD +++ b/docs/distribution/archlinux/PKGBUILD @@ -2,7 +2,7 @@ # Just build via makepkg pkgname=rmps -pkgver=20170822.0 +pkgver=20180216.0 pkgrel=1 pkgdesc='Remote Management and Provisioning System' url='https://git.smirky.net/smirky/rmps.git/' diff --git a/enum_codes b/docs/enum_codes similarity index 100% rename from enum_codes rename to docs/enum_codes diff --git a/rmpsd.service b/docs/systemd/rmpsd.service similarity index 100% rename from rmpsd.service rename to docs/systemd/rmpsd.service diff --git a/obj/.gitkeep b/obj/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db_scripts/README b/scripts/README similarity index 100% rename from db_scripts/README rename to scripts/README diff --git a/db_scripts/init_rmps_db.sh b/scripts/init_rmps_db.sh similarity index 100% rename from db_scripts/init_rmps_db.sh rename to scripts/init_rmps_db.sh diff --git a/db_scripts/init_rmps_db.sql b/scripts/init_rmps_db.sql similarity index 100% rename from db_scripts/init_rmps_db.sql rename to scripts/init_rmps_db.sql diff --git a/agent_pool.c b/src/agent_pool.c similarity index 100% rename from agent_pool.c rename to src/agent_pool.c diff --git a/agent_pool.h b/src/agent_pool.h similarity index 100% rename from agent_pool.h rename to src/agent_pool.h diff --git a/client_pool.c b/src/client_pool.c similarity index 100% rename from client_pool.c rename to src/client_pool.c diff --git a/client_pool.h b/src/client_pool.h similarity index 100% rename from client_pool.h rename to src/client_pool.h diff --git a/confparser.c b/src/confparser.c similarity index 100% rename from confparser.c rename to src/confparser.c diff --git a/confparser.h b/src/confparser.h similarity index 100% rename from confparser.h rename to src/confparser.h diff --git a/enum_functions.c b/src/enum_functions.c similarity index 100% rename from enum_functions.c rename to src/enum_functions.c diff --git a/enum_functions.h b/src/enum_functions.h similarity index 100% rename from enum_functions.h rename to src/enum_functions.h diff --git a/job_queue.c b/src/job_queue.c similarity index 100% rename from job_queue.c rename to src/job_queue.c diff --git a/job_queue.h b/src/job_queue.h similarity index 100% rename from job_queue.h rename to src/job_queue.h diff --git a/log.c b/src/log.c similarity index 100% rename from log.c rename to src/log.c diff --git a/log.h b/src/log.h similarity index 100% rename from log.h rename to src/log.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/protocol.c b/src/protocol.c similarity index 100% rename from protocol.c rename to src/protocol.c diff --git a/protocol.h b/src/protocol.h similarity index 100% rename from protocol.h rename to src/protocol.h diff --git a/rmps.c b/src/rmps.c similarity index 100% rename from rmps.c rename to src/rmps.c diff --git a/rmps.h b/src/rmps.h similarity index 100% rename from rmps.h rename to src/rmps.h diff --git a/sql.c b/src/sql.c similarity index 100% rename from sql.c rename to src/sql.c diff --git a/sql.h b/src/sql.h similarity index 100% rename from sql.h rename to src/sql.h