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.

1 files changed, 10 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index c68a271..00c35c4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,34 +2,29 @@
 # slstatus - suckless status monitor
 .POSIX:
 
-include os.mk
 include config.mk
 
 REQ = util
 COM =\
-	components/$(OS)/battery \
-	components/$(OS)/cpu \
+	components/battery\
+	components/cpu\
 	components/datetime\
 	components/disk\
-	components/$(OS)/entropy \
+	components/entropy\
 	components/hostname\
 	components/ip\
 	components/kernel_release\
 	components/keyboard_indicators\
 	components/load_avg\
 	components/num_files\
-	components/$(OS)/ram \
+	components/ram\
 	components/run_command\
-	components/$(OS)/swap \
-	components/$(OS)/temperature \
-	components/$(OS)/uptime \
+	components/swap\
+	components/temperature\
+	components/uptime\
 	components/user\
 	components/volume\
-	components/$(OS)/wifi
-
-SLSCFLAGS  = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
-SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
-SLSLIBS    = -lX11 $(OSLIBS) $(LIBS)
+	components/wifi
 
 all: slstatus
 
@@ -41,18 +36,14 @@ config.h:
 	cp config.def.h $@
 
 .o:
-	$(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
+	$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
 
 .c.o:
-	$(CC) -o $@ -c $(SLSCFLAGS) $<
+	$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 clean:
 	rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
-distclean:
-	for os in Linux OpenBSD; do make OS="$$os" clean; done
-	rm -f os.mk
-
 dist:
 	rm -rf "slstatus-$(VERSION)"
 	mkdir -p "slstatus-$(VERSION)/components"