1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- xrdp-0.4.1.orig/sesman/tools/Makefile 2009-12-07 22:03:55.838226647 +0100
+++ xrdp-0.4.1/sesman/tools/Makefile 2009-12-07 22:04:36.887226858 +0100
@@ -14,17 +14,18 @@
DEFINES = -DLIBSCP_CLIENT
CFLAGS += -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
-LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp
+LIBS = -lpthread -ldl -lscp
C_OS_FLAGS = $(CFLAGS) -c
CC = gcc
all: stest srun
stest: $(SESTESTOBJ)
- $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
+ $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LIBS)
srun: $(SESRUNOBJ)
- $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
+ $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LIBS)
os_calls.o: ../../common/os_calls.c
$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
--- xrdp-0.4.1.orig/sesman/Makefile 2009-12-07 22:24:37.898477114 +0100
+++ xrdp-0.4.1/sesman/Makefile 2009-12-07 22:25:50.484235036 +0100
@@ -18,7 +18,8 @@
-DSESMAN_DESTDIR=\"$(DESTDIR)\"
CFLAGS += -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp
+LIBS=-lpthread -ldl -lscp
C_OS_FLAGS = $(CFLAGS) -c
CC = gcc
@@ -29,19 +30,19 @@
kerberos: libscp_ kerberos-base tools
no-pam: $(SESMANOBJ) verify_user.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt $(LIBS)
pam: $(SESMANOBJ) verify_user_pam.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam $(LIBS)
pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass $(LIBS)
kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 $(LIBS)
sessvc: $(SESSVCOBJ)
- $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
+ $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LIBS)
tools: sessvc
make -C tools
|
GitWeb
