diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-09-16 16:05:05 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-09-16 16:05:05 +0200 |
| commit | 744f1b4d36f1671c03f63820246746a5b52f24be (patch) | |
| tree | fc5c86167c63d1771add281ac77a7ad8f588f206 | |
| parent | Update man page (diff) | |
| download | adjbacklight-8.2.1.tar.gz adjbacklight-8.2.1.tar.bz2 adjbacklight-8.2.1.tar.xz | |
Improve makefile and fix warnings8.2.1
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | adjbacklight.c | 6 | ||||
| -rw-r--r-- | config.mk | 6 |
3 files changed, 16 insertions, 19 deletions
@@ -3,19 +3,18 @@ CONFIGFILE = config.mk include $(CONFIGFILE) -all: adjbacklight test +BIN = adjbacklight test +OBJ = $(BIN:=.o) -adjbacklight.o: adjbacklight.c arg.h - $(CC) -c -o adjbacklight.o adjbacklight.c $(CCFLAGS) $(CPPFLAGS) -adjbacklight: adjbacklight.o - $(CC) -o adjbacklight adjbacklight.o $(LDFLAGS) +all: adjbacklight test +$(OBJ): arg.h -test.o: test.c adjbacklight.c arg.h - $(CC) -c -o test.o test.c $(CCFLAGS) $(CPPFLAGS) +.c.o: + $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) -test: test.o - $(CC) -o test test.o $(LDFLAGS) +.o: + $(CC) -o $@ $< $(LDFLAGS) check: test ./test.sh @@ -23,10 +22,8 @@ check: test install: adjbacklight mkdir -p -- "$(DESTDIR)$(PREFIX)/bin" mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1" - mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight" cp -- adjbacklight "$(DESTDIR)$(PREFIX)/bin" cp -- adjbacklight.1 "$(DESTDIR)$(MANPREFIX)/man1" - cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight" post-install: chown -- '0:$(VIDEO_GROUP)' "$(DESTDIR)$(PREFIX)/bin/adjbacklight" @@ -35,10 +32,8 @@ post-install: uninstall: -rm -- "$(DESTDIR)$(PREFIX)/bin/adjbacklight" -rm -- "$(DESTDIR)$(MANPREFIX)/man1/adjbacklight.1" - -rm -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight/LICENSE" - -rmdir -- "$(DESTDIR)$(PREFIX)/share/licenses/adjbacklight" clean: - -rm -rf -- adjbacklight test *.o .testdir + -rm -rf -- adjbacklight test .testdir *.o *.su .PHONY: all check install post-install uninstall clean diff --git a/adjbacklight.c b/adjbacklight.c index d79d11b..57495d8 100644 --- a/adjbacklight.c +++ b/adjbacklight.c @@ -134,11 +134,11 @@ adjbrightness(const char *device, double pcur, long int cur, long int max, doubl switch (strlen(suf)) { case 2: pcur = adj * pcur / 100 + pcur * inc; - cur = (long int)(pcur * (double)max + 0.5); + cur = (long int)(pcur * (double)max + (double)0.5f); break; case 1: pcur = adj / 100 + pcur * inc; - cur = (long int)(pcur * (double)max + 0.5); + cur = (long int)(pcur * (double)max + (double)0.5f); break; case 0: cur = (long int)adj + cur * inc; @@ -155,7 +155,7 @@ adjbrightness(const char *device, double pcur, long int cur, long int max, doubl static void bars(long int max, long int init, long int cur) { - long int mid = (long int)((double)cur * (double)(cols - 2) / (double)max + 0.5); + long int mid = (long int)((double)cur * (double)(cols - 2) / (double)max + (double)0.5f); printf("\033[%iD\033[6A", cols); printf("\033[2K┌%s┐\n", line); @@ -1,8 +1,10 @@ -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = $(PREFIX)/share/man VIDEO_GROUP = video -CCFLAGS = -std=c99 -Wall -Wextra -O2 +CC = cc + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 +CFLAGS = -std=c99 -Wall -O2 LDFLAGS = -s |