Attachment #16740 for bug #30597

View | Details | Raw Unified | Return to bug 30597
Collapse All | Expand All

Lines 6-12 Link Here

(-)gkrellkam/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gkrellkam	8	PORTNAME= gkrellkam
9	PORTVERSION= 0.2.3b	9	PORTVERSION= 0.2.4
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)gkrellkam/distinfo (-1 / +1 lines)
1	MD5 (gkrellkam_0.2.3b.tar.gz) = c003dca178c14f13250663deb389d0de	1	MD5 (gkrellkam_0.2.4.tar.gz) = 008239d978a6de0d3501ece78a2d7827




--- Makefile.orig	Sat Sep 15 14:52:10 2001
+++ Makefile	Sat Sep 15 14:52:45 2001
@@ -12,10 +12,9 @@
 # This should point to the GKrellM headers
 GKRELLM_HDRS = /usr/include/gkrellm
 
-CC := gcc
-GTKFLAGS := $(shell gtk-config --cflags)
-IMLIBFLAGS := $(shell imlib-config --cflags-gdk)
-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I$(GKRELLM_HDRS)
+GTKFLAGS = `${GTK_CONFIG} --cflags`
+IMLIBFLAGS = `${IMLIB_CONFIG} --cflags-gdk`
+CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${X11BASE}/include/gkrellm
 LDFLAGS := -shared -Wl
 INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins
 USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins
@@ -27,7 +26,7 @@
 all: $(TARGET).so
 
 %.so: %.o
-	$(CC) $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 clean:
 	-rm -f $(TARGET).so $(TARGET).o

Return to bug 30597

Lines 1-16 Link Here

(-)gkrellkam/files/patch-Makefile (-7 / +16 lines)
1	--- Makefile.orig Tue Jul 31 19:27:40 2001	1	--- Makefile.orig Sat Sep 15 14:52:10 2001
2	+++ Makefile Wed Aug 29 13:13:18 2001	2	+++ Makefile Sat Sep 15 14:52:45 2001
3	@@ -9,10 +9,9 @@	3	@@ -12,10 +12,9 @@
4	# To facilitate packaging- leave blank for normal installation	4	# This should point to the GKrellM headers
5	DESTDIR =	5	GKRELLM_HDRS = /usr/include/gkrellm
6		6
7	-CC := gcc	7	-CC := gcc
8	-GTKFLAGS := $(shell gtk-config --cflags)	8	-GTKFLAGS := $(shell gtk-config --cflags)
9	-IMLIBFLAGS := $(shell imlib-config --cflags-gdk)	9	-IMLIBFLAGS := $(shell imlib-config --cflags-gdk)
10	-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS)	10	-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I$(GKRELLM_HDRS)
11	+GTKFLAGS = `${GTK_CONFIG} --cflags`	11	+GTKFLAGS = `${GTK_CONFIG} --cflags`
12	+IMLIBFLAGS = `${IMLIB_CONFIG} --cflags-gdk`	12	+IMLIBFLAGS = `${IMLIB_CONFIG} --cflags-gdk`
13	+CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS)	13	+CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${X11BASE}/include/gkrellm
14	LDFLAGS := -shared -Wl	14	LDFLAGS := -shared -Wl
15	INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins	15	INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins
16	USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins	16	USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins
		17	@@ -27,7 +26,7 @@
		18	all: $(TARGET).so
		19
		20	%.so: %.o
		21	- $(CC) $(LDFLAGS) -o $@ $<
		22	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
		23
		24	clean:
		25	-rm -f $(TARGET).so $(TARGET).o