renaming and moving install files

1 files changed, 23 insertions, 35 deletions

diff --git a/sesman/tools/Makefile b/sesman/tools/Makefile
index 29e419ae..7313b7fc 100644
--- a/sesman/tools/Makefile
+++ b/sesman/tools/Makefile
@@ -1,66 +1,54 @@
 # sesman tools makefile
-SESTESTOBJ = sestest.o \
-            os_calls.o log.o
-#	    d3des.o list.o file.o \
-#            libscp_v1c.o tcp.o
+
+SESTESTOBJ = sestest.o os_calls.o log.o
 
 SESRUNOBJ = sesrun.o config.o tcp.o \
             os_calls.o d3des.o list.o file.o log.o
 
-DESTDIR = /usr/local/xrdp
 CFGDIR = /etc/xrdp
 PIDDIR = /var/run
 MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
+LIBDIR = /usr/local/lib/xrdp
+BINDIR = /usr/local/bin
 
 DEFINES = -DLIBSCP_CLIENT
 
 #CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
 CFLAGS = -Wall -g -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
-LDFLAGS = -L /usr/gnu/lib -I/usr/include/nptl -L/usr/lib/nptl -L../libscp -lpthread -ldl -lscp -Wl,-rpath,../libscp $(DEFINES)
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -lpthread -ldl -lscp -Wl,-rpath,$(LIBDIR)
 #LDFLAGS = -L /usr/gnu/lib -ldl $(DEFINES)
-C_OS_FLAGS = $(CFLAGS) -c -g
+C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
 
-all: stest srun
+all: xrdp-sestest xrdp-sesrun
 
-stest: $(SESTESTOBJ)
-	$(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
+xrdp-sestest: $(SESTESTOBJ)
+	$(CC) $(LDFLAGS) -o xrdp-sestest $(SESTESTOBJ)
 
-srun: $(SESRUNOBJ)
-	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
+xrdp-sesrun: $(SESRUNOBJ)
+	$(CC) $(LDFLAGS) -o xrdp-sesrun $(SESRUNOBJ)
 
-os_calls.o: ../../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
+clean:
+	rm -f *.o xrdp-sestest xrdp-sesrun
 
-#d3des.o: ../../common/d3des.c
+install:
+	install xrdp-sesrun $(BINDIR)/xrdp-sesrun
+	install xrdp-sestest $(BINDIR)/xrdp-sestest
+
+d3des.o: ../../common/d3des.c
 	$(CC) $(C_OS_FLAGS) ../../common/d3des.c
 
-#list.o: ../../common/list.c
+list.o: ../../common/list.c
 	$(CC) $(C_OS_FLAGS) ../../common/list.c
 
-#file.o: ../../common/file.c
+file.o: ../../common/file.c
 	$(CC) $(C_OS_FLAGS) ../../common/file.c
 
+os_calls.o: ../../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
+
 log.o: ../../common/log.c
 	$(CC) $(C_OS_FLAGS) ../../common/log.c
 
-#tcp.o: tcp.c
-#	$(CC) $(C_OS_FLAGS) ../tcp.c
-
 config.o: ../config.c
 	$(CC) $(C_OS_FLAGS) ../config.c
-
-#libscp_v1c.o: ../libscp_v1c.c
-#	$(CC) $(C_OS_FLAGS) ../libscp_v1c.c
-
-clean:
-	rm -f *.o sestest sesrun
-
-install:
-	install sesrun $(DESTDIR)/sesrun
-	install sestest $(DESTDIR)/sestest
-
-installdeb:
-	install sesrun $(DESTDIRDEB)/usr/lib/xrdp/sesrun
-	install sestest $(DESTDIRDEB)/usr/lib/xrdp/sestest