--- sesman/Makefile	2007-05-28 03:18:14 +0400
+++ sesman/Makefile	2007-08-27 13:17:23 +0400
@@ -2,7 +2,9 @@
 
 SESMANOBJ = sesman.o config.o sig.o session.o env.o \
             os_calls.o d3des.o list.o file.o log.o access.o \
-            scp.o scp_v0.o scp_v1.o thread.o lock.o
+            scp.o scp_v0.o scp_v1.o thread.o lock.o libscp/libscp_init.o \
+	    libscp/libscp_tcp.o libscp/libscp_lock.o libscp/libscp_vX.o \
+	    libscp/libscp_v0.o libscp/libscp_v1s.o
 
 SESSVCOBJ = sessvc.o os_calls.o
 
@@ -16,31 +18,32 @@
 	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
+CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES) 
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
 C_OS_FLAGS = $(CFLAGS) -c
+LDADD = -ldl -lpthread -lscp
 CC = gcc
 
-all: libscp_ pam tools
+all: libscp_ pam tools 
 
 nopam: libscp_ no-pam tools
 
 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 $(LDADD)
 
 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 $(LDADD)
 
 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 $(LDADD)
 
 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 $(LDADD)
 
 sessvc: $(SESSVCOBJ)
-	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) 
+	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LDADD)
 
 tools: sessvc
 	make -C tools
@@ -67,7 +70,7 @@
 	install sesman.ini $(DESTDIRDEB)/etc/xrdp/sesman.ini
 
 os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c $(LDADD)
 
 d3des.o: ../common/d3des.c
 	$(CC) $(C_OS_FLAGS) ../common/d3des.c
@@ -79,4 +82,4 @@
 	$(CC) $(C_OS_FLAGS) ../common/file.c
 
 log.o: ../common/log.c
-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
+	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c -ldl