kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- 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
This commit is contained in:
Stefan Gehn 2010-01-03 17:36:15 +00:00
parent ba368f9595
commit 41370ff5d4
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -238,19 +238,13 @@ macosx: gkrellm.pc
netbsd1: gkrellm.pc netbsd1: gkrellm.pc
(cd po && ${MAKE} all) (cd po && ${MAKE} all)
(cd src && ${MAKE} \ (cd src && ${MAKE} netbsd1)
EXTRAOBJS= SYS_LIBS="-lkvm" \
SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -Wl,-R/usr/X11R6/lib" \
gkrellm )
(cd server && ${MAKE} \ (cd server && ${MAKE} \
EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd ) EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd )
netbsd2: gkrellm.pc netbsd2: gkrellm.pc
(cd po && ${MAKE} all) (cd po && ${MAKE} all)
(cd src && ${MAKE} \ (cd src && ${MAKE} netbsd2)
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -R/usr/X11R6/lib" \
gkrellm )
(cd server && ${MAKE} \ (cd server && ${MAKE} \
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd ) EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd )

12
src/Makefile
View File

@ -20,7 +20,7 @@ MANMODE ?= 644
MANDIRMODE ?= 755 MANDIRMODE ?= 755
INSTALL ?= install INSTALL ?= install
LINK_FLAGS ?= -Wl,-E LINK_FLAGS ?= -Wl,-E
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE X11_LIBS ?= -L/usr/X11R6/lib -lX11 -lSM -lICE
SHARED_PATH = ../shared SHARED_PATH = ../shared
# Make GNU Make search for sources somewhere else as well # 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)\ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${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) $(NTLM_LIBS)
ifeq ($(debug),1) ifeq ($(debug),1)
@ -162,17 +162,17 @@ macosx:
EXTRAOBJS="winops-gtk-mac.o" \ EXTRAOBJS="winops-gtk-mac.o" \
LINK_FLAGS="-Wl,-bind_at_load -framework CoreFoundation" \ LINK_FLAGS="-Wl,-bind_at_load -framework CoreFoundation" \
SYS_LIBS="-lkvm -framework IOKit" \ SYS_LIBS="-lkvm -framework IOKit" \
SMC_LIBS="" \ X11_LIBS="" \
UNIXOBJS="" \ UNIXOBJS="" \
gkrellm gkrellm
netbsd1: netbsd1:
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \ $(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 gkrellm
netbsd2: netbsd2:
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \ $(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 gkrellm
openbsd: openbsd:
@ -188,7 +188,7 @@ windows: libgkrellm.a
LINK_FLAGS="${LINK_FLAGS} -mwindows" \ LINK_FLAGS="${LINK_FLAGS} -mwindows" \
EXTRAOBJS="${EXTRAOBJS} winops-win32.o win32-plugin.o win32-resource.o" \ EXTRAOBJS="${EXTRAOBJS} winops-win32.o win32-plugin.o win32-resource.o" \
SYS_LIBS=" -llargeint -lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \ SYS_LIBS=" -llargeint -lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \
SMC_LIBS="" \ X11_LIBS="" \
UNIXOBJS="" \ UNIXOBJS="" \
gkrellm gkrellm