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.
gentoo-overlay/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-...

42 lines
1.1 KiB

--- a/Makefile
+++ b/Makefile
@@ -45,11 +45,10 @@
# Parameters for gkrellm version 2.*
CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
LIBS =
-CC=/usr/bin/gcc $(CFLAGS2)
+CC += $(CFLAGS) $(CFLAGS2)
else
# Parameters for gkrellm version 1.*
-CC=/usr/bin/cc
CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk`
LIBS=
@@ -78,7 +77,7 @@
ifeq ($(INSTALLDIRD),)
INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
endif
-CCD=/usr/bin/gcc $(CFLAGSD)
+CCD = $(CC) $(CFLAGS) $(CFLAGSD)
OBJD = gkrelltopd.o top_three.o
DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
@@ -100,14 +99,14 @@
warn: ; $(WARN)
$(GKRELLTOP): $(OBJ) warn
- $(CC) -shared $(OBJ) -o $(GKRELLTOP)
+ $(CC) $(LDFLAGS) -shared $(OBJ) -o $(GKRELLTOP)
# Compile gkrelltopd.so server plugin
server: $(GKRELLTOPD) warn
@echo ""
$(GKRELLTOPD): $(OBJD)
- $(CCD) $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
+ $(CCD) $(LIBSD) $(LDFLAGS) -shared $(OBJD) -o $(GKRELLTOPD)
gkrelltop.o: gkrelltop.c
$(CC) -c gkrelltop.c -o gkrelltop.o