From 42edfea89a47cbf0623d1aaf5673a4e5ca79fb52 Mon Sep 17 00:00:00 2001 From: Laslo Hunhold Date: Tue, 1 May 2018 18:10:39 +0200 Subject: Revert component-split this reverts the commits from 92ab9ef52ebcb097add97d9f78e67ad1c1d6a6ec up to d42870d6ca7fb587b38f8cf6d6821ae33a53a696. After heavy consideration, the component split has more disadvantages than advantages, especially given there will be utility-functions sharing quite a lot of code that would then need to be duplicated, as it does not fit into the util.c due to its speciality. One big advantage of the component-wise build is readability, and without doubt, this was achieved here. This point will be addressed with a different approach that will be visible in the upcoming commits. One big disadvantage of the component build is the fact that it introduces state to the build process which is not necessary. Before its introduction, the only influencing factors where the system-defines __linux__ and __OpenBSD__. With the components, we are also relying on the output of uname(1). Additionally, if the os.mk is not present, make gives the output $ make Makefile:5: os.mk: No such file or directory make: *** No rule to make target 'os.mk'. Stop. This could easily be fixed by providing some sort of meta-rule for this file, however, it indicates the problem we have here, and this entire statefulness will heavily complicate packaging of this tool and makes the build process much more complex than it actually has to be. --- README | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'README') diff --git a/README b/README index b09fb77..78dc7ab 100644 --- a/README +++ b/README @@ -36,9 +36,8 @@ In order to build slstatus you need the Xlib header files. Installation ------------ -Run ./configure first to detect your operating system. -Optionally edit config.mk to match your local setup (slstatus is installed into -the /usr/local namespace by default). Uncomment OSSLIBS on OpenBSD. +Edit config.mk to match your local setup (slstatus is installed into the +/usr/local namespace by default). Uncomment OSSLIBS on OpenBSD. Afterwards enter the following command to build and install slstatus (if necessary as root): -- cgit v1.2.3