lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rewrite Makefile to accomodate file split

Browse source
This commit is contained in:
Laslo Hunhold 2017-09-17 17:12:44 +02:00 committed by Aaron Marcher
parent 6820631175
commit eea99fc0ac
No known key found for this signature in database
GPG key ID: 74B048E5C2474F9A
3 changed files with 131 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Makefile
View file

@ -1,25 +1,72 @@
# See LICENSE file for copyright and license details.
# See LICENSE file for copyright and license details
# slstatus - suckless status monitor
.POSIX:
include config.mk
REQ = util
HDR = arg.h
COM =\
battery\
cpu\
datetime\
disk\
entropy\
hostname\
ip\
kernel_release\
keyboard_indicators\
load_avg\
num_files\
ram\
run_command\
swap\
temperature\
uptime\
user\
volume\
wifi
all: slstatus
slstatus: slstatus.c config.h config.mk
$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) slstatus.c $(LDLIBS)
slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
slstatus.o: slstatus.c slstatus.h $(HDR) $(REQ:=.h)
config.h:
cp config.def.h $@
battery.o: battery.c config.mk $(HDR) $(REQ:=.h)
cpu.o: cpu.c config.mk $(HDR) $(REQ:=.h)
datetime.o: datetime.c config.mk $(HDR) $(REQ:=.h)
disk.o: disk.c config.mk $(HDR) $(REQ:=.h)
entropy.o: entropy.c config.mk $(HDR) $(REQ:=.h)
hostname.o: hostname.c config.mk $(HDR) $(REQ:=.h)
ip.o: ip.c config.mk $(HDR) $(REQ:=.h)
kernel_release.o: kernel_release.c config.mk $(HDR) $(REQ:=.h)
keyboard_indicators.o: keyboard_indicators.c config.mk $(HDR) $(REQ:=.h)
load_avg.o: load_avg.c config.mk $(HDR) $(REQ:=.h)
num_files.o: num_files.c config.mk $(HDR) $(REQ:=.h)
ram.o: ram.c config.mk $(HDR) $(REQ:=.h)
run_command.o: run_command.c config.mk $(HDR) $(REQ:=.h)
swap.o: swap.c config.mk $(HDR) $(REQ:=.h)
temperature.o: temperature.c config.mk $(HDR) $(REQ:=.h)
uptime.o: uptime.c config.mk $(HDR) $(REQ:=.h)
user.o: user.c config.mk $(HDR) $(REQ:=.h)
volume.o: volume.c config.mk $(HDR) $(REQ:=.h)
wifi.o: wifi.c config.mk $(HDR) $(REQ:=.h)
.o:
$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
clean:
rm -f slstatus
rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
dist:
rm -rf "slstatus-$(VERSION)"
mkdir -p "slstatus-$(VERSION)"
cp -R arg.h config.def.h config.mk LICENSE Makefile README slstatus.1 \
slstatus.c slstatus.png "slstatus-$(VERSION)"
cp -R LICENSE Makefile README config.mk config.def.h \
$(HDR) slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
slstatus.1 "slstatus-$(VERSION)"
tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
rm -rf "slstatus-$(VERSION)"

38
slstatus.c
View file

@ -18,47 +18,11 @@ struct arg {
const char *args;
};
static const char *battery_perc(const char *bat);
static const char *battery_power(const char *bat);
static const char *battery_state(const char *bat);
static const char *cpu_freq(void);
static const char *cpu_perc(void);
static const char *cpu_iowait(void);
static const char *datetime(const char *fmt);
static const char *disk_free(const char *mnt);
static const char *disk_perc(const char *mnt);
static const char *disk_total(const char *mnt);
static const char *disk_used(const char *mnt);
static const char *entropy(void);
static const char *gid(void);
static const char *hostname(void);
static const char *ipv4(const char *iface);
static const char *ipv6(const char *iface);
static const char *kernel_release(void);
static const char *keyboard_indicators(void);
static const char *load_avg(const char *fmt);
static const char *num_files(const char *dir);
static const char *ram_free(void);
static const char *ram_perc(void);
static const char *ram_used(void);
static const char *ram_total(void);
static const char *run_command(const char *cmd);
static const char *swap_free(void);
static const char *swap_perc(void);
static const char *swap_used(void);
static const char *swap_total(void);
static const char *temp(const char *file);
static const char *uid(void);
static const char *uptime(void);
static const char *username(void);
static const char *vol_perc(const char *card);
static const char *wifi_perc(const char *iface);
static const char *wifi_essid(const char *iface);
char *argv0;
static unsigned short int done;
static Display *dpy;
#include "slstatus.h"
#include "config.h"
static void

75
slstatus.h Normal file
View file

@ -0,0 +1,75 @@
/* See LICENSE file for copyright and license details. */
/* battery */
const char *battery_perc(const char *);
const char *battery_power(const char *);
const char *battery_state(const char *);
/* cpu */
const char *cpu_freq(void);
const char *cpu_perc(void);
const char *cpu_iowait(void);
/* datetime */
const char *datetime(const char *);
/* disk */
const char *disk_free(const char *);
const char *disk_perc(const char *);
const char *disk_total(const char *);
const char *disk_used(const char *);
/* entropy */
const char *entropy(void);
/* hostname */
const char *hostname(void);
/* ip */
const char *ipv4(const char *);
const char *ipv6(const char *);
/* kernel_release */
const char *kernel_release(void);
/* keyboard_indicators */
const char *keyboard_indicators(void);
/* load_avg */
const char *load_avg(const char *);
/* num_files */
const char *num_files(const char *);
/* ram */
const char *ram_free(void);
const char *ram_perc(void);
const char *ram_total(void);
const char *ram_used(void);
/* run_command */
const char *run_command(const char *);
/* swap */
const char *swap_free(void);
const char *swap_perc(void);
const char *swap_total(void);
const char *swap_used(void);
/* temperature */
const char *temp(const char *);
/* uptime */
const char *uptime(void);
/* user */
const char *gid(void);
const char *username(void);
const char *uid(void);
/* volume */
const char *vol_perc(const char *);
/* wifi */
const char *wifi_perc(const char *);
const char *wifi_essid(const char *);