1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
|
Description: Fix build rules to work with Debian and hardening
Also switch to using pkg-config to locate gtk build settings.
Author: Petter Reinholdtsen
Forwarded: no
Last-Update: 2024-08-21
Index: gkrellm-xkb-salsa/Makefile
===================================================================
--- gkrellm-xkb-salsa.orig/Makefile 2024-08-21 05:14:21.137723489 +0000
+++ gkrellm-xkb-salsa/Makefile 2024-08-21 05:14:21.133723442 +0000
@@ -1,22 +1,23 @@
-PREFIX ?= /usr/local
-GTK_CONFIG = pkg-config gtk+-2.0
+PREFIX ?= $(DESTDIR)/usr
+PKG_CONFIG ?= pkg-config
+GTK_CONFIG = $(PKG_CONFIG) gtk+-2.0
PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
GKRELLM_INCLUDE = -I$(PREFIX)/include
GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
GTK_LIB = `$(GTK_CONFIG) --libs`
-FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
-CFLAGS ?= -O -g
-CFLAGS += $(FLAGS)
+FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) $(CPPFLAGS)
+CFLAGS ?= -O
+CFLAGS += -g $(FLAGS)
LIBS = $(GTK_LIB)
-LFLAGS = -shared
+LDFLAGS += -shared
CC ?= gcc
INSTALL = install -c
INSTALL_PROGRAM = $(INSTALL) -s
PIX = caps_off.xpm caps_on.xpm num_off.xpm num_on.xpm
xkb.so: main.o
- $(CC) $(FLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
+ $(CC) $(FLAGS) main.o -o xkb.so $(LIBS) $(LDFLAGS)
clean:
rm -f *.o core *.so* *.bak *~
@@ -25,4 +26,4 @@
$(INSTALL_PROGRAM) xkb.so $(PLUGIN_DIR)
main.o: main.c $(PIX)
- $(CC) $(FLAGS) -c main.c
+ $(CC) $(CFLAGS) -c main.c
|