From 41370ff5d4a60818c7c9b4ca96a480fd79e5d2b0 Mon Sep 17 00:00:00 2001
From: Stefan Gehn <stefan@srcbox.net>
Date: Sun, 3 Jan 2010 17:36:15 +0000
Subject: [PATCH] - src/Makefile: Rename SMC_LIBS to X11_lIBS and add -lX11
 (should fix http://bugs.debian.org/554553) - Makefile: Drop duplicating
 SMC_LIBS in "netbsd" targets by calling src/Makefile with "netbsd" target
 instead of using the generic "gkrellm" target

---
 Makefile     | 10 ++--------
 src/Makefile | 12 ++++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 04fedd9..4cf6ecb 100644
--- a/Makefile
+++ b/Makefile
@@ -238,19 +238,13 @@ macosx: gkrellm.pc
 
 netbsd1: gkrellm.pc
 	(cd po && ${MAKE} all)
-	(cd src && ${MAKE} \
-		EXTRAOBJS= SYS_LIBS="-lkvm" \
-		SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -Wl,-R/usr/X11R6/lib" \
-		gkrellm )
+	(cd src && ${MAKE} netbsd1)
 	(cd server && ${MAKE} \
 		EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd )
 
 netbsd2: gkrellm.pc
 	(cd po && ${MAKE} all)
-	(cd src && ${MAKE} \
-		EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
-		SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -R/usr/X11R6/lib" \
-		gkrellm )
+	(cd src && ${MAKE} netbsd2)
 	(cd server && ${MAKE} \
 		EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd )
 
diff --git a/src/Makefile b/src/Makefile
index b3fc110..beb81e2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
 LINK_FLAGS ?= -Wl,-E
-SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
+X11_LIBS ?= -L/usr/X11R6/lib -lX11 -lSM -lICE
 
 SHARED_PATH = ../shared
 # Make GNU Make search for sources somewhere else as well
@@ -72,7 +72,7 @@ PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
 FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
 
-LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\
+LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\
  $(NTLM_LIBS)
 
 ifeq ($(debug),1)
@@ -162,17 +162,17 @@ macosx:
 		EXTRAOBJS="winops-gtk-mac.o" \
 		LINK_FLAGS="-Wl,-bind_at_load -framework CoreFoundation" \
 		SYS_LIBS="-lkvm -framework IOKit" \
-		SMC_LIBS="" \
+		X11_LIBS="" \
 		UNIXOBJS="" \
  		gkrellm
 
 netbsd1:
 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \
-		SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -Wl,-R/usr/X11R6/lib" \
+		X11_LIBS="-L/usr/X11R6/lib -lX11 -lSM -lICE -Wl,-R/usr/X11R6/lib" \
 		gkrellm
 netbsd2:
 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
-		SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -R/usr/X11R6/lib" \
+		X11_LIBS="-L/usr/X11R6/lib -lX11 -lSM -lICE -R/usr/X11R6/lib" \
 		gkrellm
 
 openbsd:
@@ -188,7 +188,7 @@ windows: libgkrellm.a
 		LINK_FLAGS="${LINK_FLAGS} -mwindows" \
 		EXTRAOBJS="${EXTRAOBJS} winops-win32.o win32-plugin.o win32-resource.o" \
 		SYS_LIBS=" -llargeint -lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \
-		SMC_LIBS="" \
+		X11_LIBS="" \
 		UNIXOBJS="" \
 		gkrellm