commit 42edfea89a47cbf0623d1aaf5673a4e5ca79fb52
Author: Laslo Hunhold <dev_AT_frign.de>
AuthorDate: Tue May 1 18:10:39 2018 +0200
Commit: Aaron Marcher <me_AT_drkhsh.at>
CommitDate: Tue May 1 19:43:34 2018 +0200
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.
diff --git a/LICENSE b/LICENSE
index 6fa0384..ae87dc6 100644
--- a/LICENSE
+++ b/LICENSE
_AT_@ -7,7 +7,7 @@ Copyright 2016 Vincent Loupmon <vincentloupmon_AT_gmail.com>
Copyright 2016 Daniel Walter <d.walter_AT_0x90.at>
Copyright 2016-2018 Ali H. Fardan <raiz_AT_firemail.cc>
Copyright 2016 Jody Leonard <me_AT_jodyleonard.com>
-Copyright 2016-2018 Quentin Rameau <quinq_AT_fifth.space>
+Copyright 2016-2017 Quentin Rameau <quinq_AT_fifth.space>
Copyright 2016 Mike Coddington <mike_AT_coddington.us>
Copyright 2016-2018 parazyd <parazyd_AT_dyne.org>
Copyright 2017 Tobias Stoeckmann <tobias_AT_stoeckmann.org>
diff --git a/Makefile b/Makefile
index c68a271..00c35c4 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -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
_AT_@ -41,18 +36,14 @@ config.h:
cp config.def.h $_AT_
.o:
- $(CC) -o $_AT_ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
+ $(CC) -o $_AT_ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
.c.o:
- $(CC) -o $_AT_ -c $(SLSCFLAGS) $<
+ $(CC) -o $_AT_ -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"
diff --git a/README b/README
index b09fb77..78dc7ab 100644
--- a/README
+++ b/README
_AT_@ -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):
diff --git a/components/Linux/ram.c b/components/Linux/ram.c
deleted file mode 100644
index 7df5f85..0000000
--- a/components/Linux/ram.c
+++ /dev/null
_AT_@ -1,52 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "../../util.h"
-
-const char *
-ram_free(void)
-{
- long free;
-
- return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
- bprintf("%f", (float)free / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_perc(void)
-{
- long total, free, buffers, cached;
-
- return (pscanf("/proc/meminfo",
- "MemTotal: %ld kB\n"
- "MemFree: %ld kB\n"
- "MemAvailable: %ld kB\nBuffers: %ld kB\n"
- "Cached: %ld kB\n",
- &total, &free, &buffers, &buffers, &cached) == 5) ?
- bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
- NULL;
-}
-
-const char *
-ram_total(void)
-{
- long total;
-
- return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
- bprintf("%f", (float)total / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_used(void)
-{
- long total, free, buffers, cached;
-
- return (pscanf("/proc/meminfo",
- "MemTotal: %ld kB\n"
- "MemFree: %ld kB\n"
- "MemAvailable: %ld kB\nBuffers: %ld kB\n"
- "Cached: %ld kB\n",
- &total, &free, &buffers, &buffers, &cached) == 5) ?
- bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
- NULL;
-}
diff --git a/components/Linux/temperature.c b/components/Linux/temperature.c
deleted file mode 100644
index fa50826..0000000
--- a/components/Linux/temperature.c
+++ /dev/null
_AT_@ -1,15 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-temp(const char *file)
-{
- int temp;
-
- return (pscanf(file, "%d", &temp) == 1) ?
- bprintf("%d", temp / 1000) : NULL;
-}
diff --git a/components/Linux/uptime.c b/components/Linux/uptime.c
deleted file mode 100644
index e7afc8e..0000000
--- a/components/Linux/uptime.c
+++ /dev/null
_AT_@ -1,24 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysinfo.h>
-
-#include "../../util.h"
-
-const char *
-uptime(void)
-{
- int h;
- int m;
- int uptime = 0;
- struct sysinfo info;
-
- sysinfo(&info);
- uptime = info.uptime;
-
- h = uptime / 3600;
- m = (uptime - h * 3600) / 60;
-
- return bprintf("%dh %dm", h, m);
-}
diff --git a/components/OpenBSD/battery.c b/components/OpenBSD/battery.c
deleted file mode 100644
index daefd77..0000000
--- a/components/OpenBSD/battery.c
+++ /dev/null
_AT_@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-
-#include "../../util.h"
-
-const char *
-battery_perc(const char *null)
-{
- struct apm_power_info apm_info;
- int fd;
-
- fd = open("/dev/apm", O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
- return NULL;
- }
-
- if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
- fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
- close(fd);
- return NULL;
- }
- close(fd);
-
- return bprintf("%d", apm_info.battery_life);
-}
diff --git a/components/OpenBSD/cpu.c b/components/OpenBSD/cpu.c
deleted file mode 100644
index 11f1812..0000000
--- a/components/OpenBSD/cpu.c
+++ /dev/null
_AT_@ -1,26 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysctl.h>
-
-#include "../../util.h"
-
-const char *
-cpu_freq(void)
-{
- int freq, mib[2];
- size_t size;
-
- mib[0] = CTL_HW;
- mib[1] = HW_CPUSPEED;
-
- size = sizeof(freq);
-
- if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
- fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
- return NULL;
- }
-
- return bprintf("%d", freq);
-}
diff --git a/components/OpenBSD/entropy.c b/components/OpenBSD/entropy.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/OpenBSD/ram.c b/components/OpenBSD/ram.c
deleted file mode 100644
index f7c81d1..0000000
--- a/components/OpenBSD/ram.c
+++ /dev/null
_AT_@ -1,77 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "../../util.h"
-
-inline int
-load_uvmexp(struct uvmexp *uvmexp)
-{
- int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
- size_t size;
-
- size = sizeof(*uvmexp);
-
- return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
-}
-
-const char *
-ram_free(void)
-{
- struct uvmexp uvmexp;
- float free;
- int free_pages;
-
- if (load_uvmexp(&uvmexp)) {
- free_pages = uvmexp.npages - uvmexp.active;
- free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", free);
- }
-
- return NULL;
-}
-
-const char *
-ram_perc(void)
-{
- struct uvmexp uvmexp;
- int percent;
-
- if (load_uvmexp(&uvmexp)) {
- percent = uvmexp.active * 100 / uvmexp.npages;
- return bprintf("%d", percent);
- }
-
- return NULL;
-}
-
-const char *
-ram_total(void)
-{
- struct uvmexp uvmexp;
- float total;
-
- if (load_uvmexp(&uvmexp)) {
- total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", total);
- }
-
- return NULL;
-}
-
-const char *
-ram_used(void)
-{
- struct uvmexp uvmexp;
- float used;
-
- if (load_uvmexp(&uvmexp)) {
- used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", used);
- }
-
- return NULL;
-}
diff --git a/components/OpenBSD/swap.c b/components/OpenBSD/swap.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/OpenBSD/wifi.c b/components/OpenBSD/wifi.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/Linux/battery.c b/components/battery.c
similarity index 63%
rename from components/Linux/battery.c
rename to components/battery.c
index 654ddab..955d8ab 100644
--- a/components/Linux/battery.c
+++ b/components/battery.c
_AT_@ -2,11 +2,19 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#if defined(__linux__)
#include <limits.h>
#include <string.h>
+#elif defined(__OpenBSD__)
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <machine/apmvar.h>
+#endif
-#include "../../util.h"
+#include "../util.h"
+#if defined(__linux__)
const char *
battery_perc(const char *bat)
{
_AT_@ -17,7 +25,31 @@ battery_perc(const char *bat)
return (pscanf(path, "%i", &perc) == 1) ?
bprintf("%d", perc) : NULL;
}
+#elif defined(__OpenBSD__)
+const char *
+battery_perc(const char *null)
+{
+ struct apm_power_info apm_info;
+ int fd;
+
+ fd = open("/dev/apm", O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+ fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
+ close(fd);
+ return NULL;
+ }
+ close(fd);
+
+ return bprintf("%d", apm_info.battery_life);
+}
+#endif
+#if defined(__linux__)
const char *
battery_power(const char *bat)
{
_AT_@ -56,3 +88,4 @@ battery_state(const char *bat)
}
return (i == LEN(map)) ? "?" : map[i].symbol;
}
+#endif
diff --git a/components/Linux/cpu.c b/components/cpu.c
similarity index 75%
rename from components/Linux/cpu.c
rename to components/cpu.c
index bfc204c..11e2e98 100644
--- a/components/Linux/cpu.c
+++ b/components/cpu.c
_AT_@ -2,9 +2,13 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#if defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#endif
-#include "../../util.h"
+#include "../util.h"
+#if defined(__linux__)
const char *
cpu_freq(void)
{
_AT_@ -62,3 +66,23 @@ cpu_iowait(void)
return bprintf("%d", perc);
}
+#elif defined(__OpenBSD__)
+const char *
+cpu_freq(void)
+{
+ int freq, mib[2];
+ size_t size;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_CPUSPEED;
+
+ size = sizeof(freq);
+
+ if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
+ fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ return bprintf("%d", freq);
+}
+#endif
diff --git a/components/Linux/entropy.c b/components/entropy.c
similarity index 82%
rename from components/Linux/entropy.c
rename to components/entropy.c
index 17be270..65c65a1 100644
--- a/components/Linux/entropy.c
+++ b/components/entropy.c
_AT_@ -1,7 +1,8 @@
/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
#include <stdio.h>
-#include "../../util.h"
+#include "../util.h"
const char *
entropy(void)
_AT_@ -11,3 +12,4 @@ entropy(void)
return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
bprintf("%d", num) : NULL;
}
+#endif
diff --git a/components/ram.c b/components/ram.c
new file mode 100644
index 0000000..55ec5b9
--- /dev/null
+++ b/components/ram.c
_AT_@ -0,0 +1,129 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#if defined (__OpenBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+ram_free(void)
+{
+ long free;
+
+ return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
+ bprintf("%f", (float)free / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_perc(void)
+{
+ long total, free, buffers, cached;
+
+ return (pscanf("/proc/meminfo",
+ "MemTotal: %ld kB\n"
+ "MemFree: %ld kB\n"
+ "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+ "Cached: %ld kB\n",
+ &total, &free, &buffers, &buffers, &cached) == 5) ?
+ bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
+ NULL;
+}
+
+const char *
+ram_total(void)
+{
+ long total;
+
+ return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
+ bprintf("%f", (float)total / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_used(void)
+{
+ long total, free, buffers, cached;
+
+ return (pscanf("/proc/meminfo",
+ "MemTotal: %ld kB\n"
+ "MemFree: %ld kB\n"
+ "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+ "Cached: %ld kB\n",
+ &total, &free, &buffers, &buffers, &cached) == 5) ?
+ bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
+ NULL;
+}
+#elif defined(__OpenBSD__)
+inline int
+load_uvmexp(struct uvmexp *uvmexp)
+{
+ int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
+ size_t size;
+
+ size = sizeof(*uvmexp);
+
+ return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
+}
+
+const char *
+ram_free(void)
+{
+ struct uvmexp uvmexp;
+ float free;
+ int free_pages;
+
+ if (load_uvmexp(&uvmexp)) {
+ free_pages = uvmexp.npages - uvmexp.active;
+ free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", free);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_perc(void)
+{
+ struct uvmexp uvmexp;
+ int percent;
+
+ if (load_uvmexp(&uvmexp)) {
+ percent = uvmexp.active * 100 / uvmexp.npages;
+ return bprintf("%d", percent);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_total(void)
+{
+ struct uvmexp uvmexp;
+ float total;
+
+ if (load_uvmexp(&uvmexp)) {
+ total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", total);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_used(void)
+{
+ struct uvmexp uvmexp;
+ float used;
+
+ if (load_uvmexp(&uvmexp)) {
+ used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", used);
+ }
+
+ return NULL;
+}
+#endif
diff --git a/components/Linux/swap.c b/components/swap.c
similarity index 98%
rename from components/Linux/swap.c
rename to components/swap.c
index bce9d5a..f3bbeb2 100644
--- a/components/Linux/swap.c
+++ b/components/swap.c
_AT_@ -1,9 +1,10 @@
/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
#include <errno.h>
#include <stdio.h>
#include <string.h>
-#include "../../util.h"
+#include "../util.h"
const char *
swap_free(void)
_AT_@ -134,3 +135,4 @@ swap_used(void)
return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
}
+#endif
diff --git a/components/OpenBSD/temperature.c b/components/temperature.c
similarity index 71%
rename from components/OpenBSD/temperature.c
rename to components/temperature.c
index 8098868..e2c6a77 100644
--- a/components/OpenBSD/temperature.c
+++ b/components/temperature.c
_AT_@ -2,12 +2,24 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#if defined(__OpenBSD__)
#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/sensors.h>
+#endif
-#include "../../util.h"
+#include "../util.h"
+#if defined(__linux__)
+const char *
+temp(const char *file)
+{
+ int temp;
+
+ return (pscanf(file, "%d", &temp) == 1) ?
+ bprintf("%d", temp / 1000) : NULL;
+}
+#elif defined(__OpenBSD__)
const char *
temp(const char *null)
{
_AT_@ -30,3 +42,4 @@ temp(const char *null)
return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
}
+#endif
diff --git a/components/OpenBSD/uptime.c b/components/uptime.c
similarity index 63%
rename from components/OpenBSD/uptime.c
rename to components/uptime.c
index 637e2e0..debe4cb 100644
--- a/components/OpenBSD/uptime.c
+++ b/components/uptime.c
_AT_@ -2,11 +2,33 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#if defined(__linux__)
+#include <sys/sysinfo.h>
+#elif defined(__OpenBSD__)
#include <sys/sysctl.h>
#include <sys/time.h>
+#endif
-#include "../../util.h"
+#include "../util.h"
+#if defined(__linux__)
+const char *
+uptime(void)
+{
+ int h;
+ int m;
+ int uptime = 0;
+ struct sysinfo info;
+
+ sysinfo(&info);
+ uptime = info.uptime;
+
+ h = uptime / 3600;
+ m = (uptime - h * 3600) / 60;
+
+ return bprintf("%dh %dm", h, m);
+}
+#elif defined(__OpenBSD__)
const char *
uptime(void)
{
_AT_@ -38,3 +60,4 @@ uptime(void)
return bprintf("%dh %dm", h, m);
}
+#endif
diff --git a/components/Linux/wifi.c b/components/wifi.c
similarity index 97%
rename from components/Linux/wifi.c
rename to components/wifi.c
index e86fcbc..388a30d 100644
--- a/components/Linux/wifi.c
+++ b/components/wifi.c
_AT_@ -1,4 +1,5 @@
/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
#include <errno.h>
#include <ifaddrs.h>
#include <linux/wireless.h>
_AT_@ -9,7 +10,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
-#include "../../util.h"
+#include "../util.h"
const char *
wifi_perc(const char *iface)
_AT_@ -88,3 +89,4 @@ wifi_essid(const char *iface)
else
return id;
}
+#endif
diff --git a/config.mk b/config.mk
index 6fbf696..a148da4 100644
--- a/config.mk
+++ b/config.mk
_AT_@ -4,13 +4,20 @@ VERSION = 0
# customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
+# OpenBSD (uncomment)
+#OSSLIBS = -lossaudio
+
# flags
+CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE
CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os
-LDFLAGS = -s
-LIBS =
+LDFLAGS = -L$(X11LIB) -s
+LDLIBS = -lX11 ${OSSLIBS}
+
+# compiler and linker
+CC = cc
diff --git a/configure b/configure
deleted file mode 100755
index 2a510c7..0000000
--- a/configure
+++ /dev/null
_AT_@ -1,10 +0,0 @@
-#!/bin/sh
-
-os="$(uname)"
-
-printf 'OS = %s\n' "$os" > os.mk
-
-if [ "$os" = "OpenBSD" ]
-then
- printf 'OSLIBS = -lossaudio\n' >> os.mk
-fi
Received on Tue May 01 2018 - 19:50:23 CEST