You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.8 KiB
51 lines
1.8 KiB
10 years ago
|
--- a/Makefile
|
||
|
+++ b/Makefile
|
||
3 years ago
|
@@ -4,23 +4,23 @@ DESTDIR ?= /
|
||
|
|
||
|
TARGET = xbattbar
|
||
|
APM_CHECK = xbattbar-check-apm
|
||
|
-CPPFLAGS = -D_FORTIFY_SOURCE=2
|
||
|
-CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS)
|
||
|
-LDFLAGS = -Wl,-z,relro
|
||
|
+CPPFLAGS ?= -D_FORTIFY_SOURCE=2
|
||
|
+CFLAGS ?= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
|
||
|
+LDFLAGS ?= -Wl,-z,relro
|
||
|
|
||
10 years ago
|
all: $(TARGET) $(APM_CHECK)
|
||
|
|
||
|
$(TARGET): obj/xbattbar.o
|
||
|
- gcc -o $@ $< -lX11 $(LDFLAGS)
|
||
3 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
|
||
10 years ago
|
|
||
|
obj/xbattbar.o: xbattbar.c obj/stamp
|
||
|
- gcc -MMD -o $@ -c $< $(CFLAGS)
|
||
3 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
|
||
10 years ago
|
|
||
|
$(APM_CHECK): obj/xbattbar-check-apm.o
|
||
|
- gcc -o $@ $< $(LDFLAGS)
|
||
3 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
|
||
10 years ago
|
|
||
|
obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
|
||
|
- gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS)
|
||
3 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
|
||
10 years ago
|
|
||
|
obj/stamp:
|
||
|
mkdir obj
|
||
3 years ago
|
@@ -32,12 +32,12 @@ clean:
|
||
10 years ago
|
|
||
|
|
||
|
install: $(TARGET) $(APM_CHECK)
|
||
|
- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
|
||
|
+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
|
||
|
install -d -m 0755 $(DESTDIR)/usr/bin
|
||
|
install -d -m 0755 $(DESTDIR)/usr/share/man/man1
|
||
|
- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
|
||
|
- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
|
||
|
- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/
|
||
|
+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
|
||
|
+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
|
||
|
+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
|
||
|
install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
|
||
|
install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1
|
||
|
|