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.
36 lines
958 B
36 lines
958 B
This patch is by Michael Mair-Keimberger, as part of bug 338786. It
|
|
teaches the Makefile to support the user's LDFLAGS.
|
|
|
|
Gentoo-Bug: 338786
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -5,18 +5,16 @@
|
|
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 = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
|
|
LIBS = $(GTK_LIB)
|
|
LFLAGS = -shared
|
|
-CC ?= gcc
|
|
+CC = $(CC)
|
|
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) $(CFLAGS) $(FLAGS) $(LDFLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
|
|
|
|
clean:
|
|
rm -f *.o core *.so* *.bak *~
|
|
@@ -25,4 +23,4 @@
|
|
$(INSTALL_PROGRAM) xkb.so $(PLUGIN_DIR)
|
|
|
|
main.o: main.c $(PIX)
|
|
- $(CC) $(FLAGS) -c main.c
|
|
+ $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -c main.c
|