fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of HDR variable 

The HDR variable is used for general purpose headers, which are not
given in this project. arg.h and config.h are only needed for
slstatus.c, not every component $(COM:=.c).

This also fixes a problem introduced in
e04a385364, where config.h is pulled into
the tarball.
This commit is contained in:
Laslo Hunhold 2017-09-18 08:53:19 +02:00 committed by Aaron Marcher
parent f56e50a269
commit 61e44e8948
No known key found for this signature in database
GPG Key ID: 74B048E5C2474F9A
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -5,7 +5,6 @@
include config.mk include config.mk
REQ = util REQ = util
HDR = arg.h config.h
COM =\ COM =\
battery\ battery\
cpu\ cpu\
@ -30,8 +29,8 @@ COM =\
all: slstatus all: slstatus
slstatus: slstatus.o $(COM:=.o) $(REQ:=.o) slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
slstatus.o: slstatus.c slstatus.h $(HDR) $(REQ:=.h) slstatus.o: slstatus.c slstatus.h arg.h config.h $(REQ:=.h)
$(COM:=.o): config.mk $(HDR) $(REQ:=.h) $(COM:=.o): config.mk $(REQ:=.h)
config.h: config.h:
cp config.def.h $@ cp config.def.h $@
@ -49,7 +48,7 @@ dist:
rm -rf "slstatus-$(VERSION)" rm -rf "slstatus-$(VERSION)"
mkdir -p "slstatus-$(VERSION)" mkdir -p "slstatus-$(VERSION)"
cp -R LICENSE Makefile README config.mk config.def.h \ cp -R LICENSE Makefile README config.mk config.def.h \
$(HDR) slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \ arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
slstatus.1 "slstatus-$(VERSION)" slstatus.1 "slstatus-$(VERSION)"
tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz" tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
rm -rf "slstatus-$(VERSION)" rm -rf "slstatus-$(VERSION)"