|
Line
Link Here
|
| 0 |
-- server/Makefile |
0 |
++ server/Makefile |
|
Lines 21-27
Link Here
|
| 21 |
MANMODE ?= 644 |
21 |
MANMODE ?= 644 |
| 22 |
MANDIRMODE ?= 755 |
22 |
MANDIRMODE ?= 755 |
| 23 |
INSTALL ?= install |
23 |
INSTALL ?= install |
| 24 |
LINK_FLAGS ?= -Wl,-E |
24 |
LINK_FLAGS ?= $(LDFLAGS) -Wl,-E |
| 25 |
EXTRAOBJS = |
25 |
EXTRAOBJS = |
| 26 |
|
26 |
|
| 27 |
|
27 |
|
|
Lines 41-47
Link Here
|
| 41 |
|
41 |
|
| 42 |
|
42 |
|
| 43 |
CC ?= gcc |
43 |
CC ?= gcc |
| 44 |
STRIP ?= -s |
44 |
STRIP ?= |
| 45 |
|
45 |
|
| 46 |
GKRELLMD_INCLUDES = gkrellmd.h |
46 |
GKRELLMD_INCLUDES = gkrellmd.h |
| 47 |
|
47 |
|
|
Lines 51-57
Link Here
|
| 51 |
GLIB12_INCLUDE = `glib-config --cflags` |
51 |
GLIB12_INCLUDE = `glib-config --cflags` |
| 52 |
GLIB12_LIB = `glib-config --libs glib gmodule` |
52 |
GLIB12_LIB = `glib-config --libs glib gmodule` |
| 53 |
|
53 |
|
| 54 |
FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
54 |
FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 55 |
ifeq ($(glib12),1) |
55 |
ifeq ($(glib12),1) |
| 56 |
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) |
56 |
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) |
| 57 |
endif |
57 |
endif |
| 58 |
-- src/Makefile |
58 |
++ src/Makefile |
|
Lines 18-24
Link Here
|
| 18 |
MANMODE ?= 644 |
18 |
MANMODE ?= 644 |
| 19 |
MANDIRMODE ?= 755 |
19 |
MANDIRMODE ?= 755 |
| 20 |
INSTALL ?= install |
20 |
INSTALL ?= install |
| 21 |
LINK_FLAGS ?= -Wl,-E |
21 |
LINK_FLAGS ?= $(LDFLAGS) -Wl,-E |
| 22 |
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE |
22 |
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE |
| 23 |
|
23 |
|
| 24 |
ifeq ($(without-gnutls),1) |
24 |
ifeq ($(without-gnutls),1) |
|
Lines 62-68
Link Here
|
| 62 |
endif |
62 |
endif |
| 63 |
|
63 |
|
| 64 |
CC ?= gcc |
64 |
CC ?= gcc |
| 65 |
STRIP ?= -s |
65 |
STRIP ?= |
| 66 |
|
66 |
|
| 67 |
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h |
67 |
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h |
| 68 |
|
68 |
|
|
Lines 70-76
Link Here
|
| 70 |
|
70 |
|
| 71 |
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` |
71 |
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` |
| 72 |
|
72 |
|
| 73 |
FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
73 |
FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 74 |
FLAGS+= $(PTHREAD_INC) |
74 |
FLAGS+= $(PTHREAD_INC) |
| 75 |
|
75 |
|
| 76 |
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) |
76 |
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) |
