Move components into dedicated subdirectory
This brings us a lot more tidiness.
This commit is contained in:
parent
61e44e8948
commit
7246dc4381
42
Makefile
42
Makefile
@ -6,25 +6,25 @@ include config.mk
|
||||
|
||||
REQ = util
|
||||
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
|
||||
components/battery\
|
||||
components/cpu\
|
||||
components/datetime\
|
||||
components/disk\
|
||||
components/entropy\
|
||||
components/hostname\
|
||||
components/ip\
|
||||
components/kernel_release\
|
||||
components/keyboard_indicators\
|
||||
components/load_avg\
|
||||
components/num_files\
|
||||
components/ram\
|
||||
components/run_command\
|
||||
components/swap\
|
||||
components/temperature\
|
||||
components/uptime\
|
||||
components/user\
|
||||
components/volume\
|
||||
components/wifi
|
||||
|
||||
all: slstatus
|
||||
|
||||
@ -39,14 +39,14 @@ config.h:
|
||||
$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
|
||||
$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
|
||||
|
||||
clean:
|
||||
rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
|
||||
|
||||
dist:
|
||||
rm -rf "slstatus-$(VERSION)"
|
||||
mkdir -p "slstatus-$(VERSION)"
|
||||
mkdir -p "slstatus-$(VERSION)/components"
|
||||
cp -R LICENSE Makefile README config.mk config.def.h \
|
||||
arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
|
||||
slstatus.1 "slstatus-$(VERSION)"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
battery_perc(const char *bat)
|
@ -2,7 +2,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
cpu_freq(void)
|
@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <time.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
datetime(const char *fmt)
|
@ -3,7 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <sys/statvfs.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
disk_free(const char *mnt)
|
@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdio.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
entropy(void)
|
@ -2,7 +2,7 @@
|
||||
#include <err.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
hostname(void)
|
@ -5,7 +5,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
ipv4(const char *iface)
|
@ -2,7 +2,7 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
kernel_release(void)
|
@ -2,7 +2,7 @@
|
||||
#include <err.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
keyboard_indicators(void)
|
@ -2,7 +2,7 @@
|
||||
#include <err.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
load_avg(const char *fmt)
|
@ -4,7 +4,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
num_files(const char *dir)
|
@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdio.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
ram_free(void)
|
@ -3,7 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
run_command(const char *cmd)
|
@ -3,7 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
swap_free(void)
|
@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdio.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
temp(const char *file)
|
@ -1,7 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <sys/sysinfo.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
uptime(void)
|
@ -4,7 +4,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
gid(void)
|
@ -7,7 +7,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
vol_perc(const char *card)
|
@ -9,7 +9,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
wifi_perc(const char *iface)
|
Loading…
Reference in New Issue
Block a user