26 files changed, 0 insertions, 1119 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 15b6502a..00000000
--- a/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-LIBDIR = /usr/local/lib/xrdp
-BINDIR = /usr/local/bin
-SBINDIR = /usr/local/sbin
-SHAREDIR = /usr/local/share/xrdp
-
-all: world
-
-world: base
-	$(MAKE) -C sesman
-
-base:
-	$(MAKE) -C vnc
-	$(MAKE) -C libxrdp
-	$(MAKE) -C xrdp
-	$(MAKE) -C rdp
-	$(MAKE) -C xup
-	$(MAKE) -C keygen
-
-nopam: base
-	$(MAKE) -C sesman nopam
-	$(MAKE) -C sesman tools
-
-kerberos: base
-	$(MAKE) -C sesman kerberos
-	$(MAKE) -C sesman tools
-
-clean:
-	$(MAKE) -C vnc clean
-	$(MAKE) -C libxrdp clean
-	$(MAKE) -C xrdp clean
-	$(MAKE) -C rdp clean
-	$(MAKE) -C sesman clean
-	$(MAKE) -C xup clean
-	$(MAKE) -C keygen clean
-
-install:
-	mkdir -p $(CFGDIR)
-	mkdir -p $(PIDDIR)
-	mkdir -p $(MANDIR)
-	mkdir -p $(LIBDIR)
-	mkdir -p $(BINDIR)
-	mkdir -p $(SBINDIR)
-	mkdir -p $(SHAREDIR)
-	$(MAKE) -C vnc install
-	$(MAKE) -C libxrdp install
-	$(MAKE) -C xrdp install
-	$(MAKE) -C rdp install
-	$(MAKE) -C sesman install
-	$(MAKE) -C xup install
-	$(MAKE) -C keygen install
-	$(MAKE) -C docs install
-	if [ -d /etc/pam.d ]; then install instfiles/pam.d/xrdp-sesman /etc/pam.d/xrdp-sesman; fi
-	if [ -d /etc/init.d ]; then install instfiles/xrdp.sh /etc/init.d/xrdp.sh; fi
-	xrdp-keygen xrdp auto
diff --git a/Makefile.osx b/Makefile.osx
deleted file mode 100644
index fab38983..00000000
--- a/Makefile.osx
+++ /dev/null
@@ -1,50 +0,0 @@
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-all: kerberos
-
-world: base
-	$(MAKE) -C sesman
-
-base:
-	$(MAKE) -C vnc -f Makefile.osx
-	$(MAKE) -C libxrdp -f Makefile.osx
-	$(MAKE) -C xrdp -f Makefile.osx
-	$(MAKE) -C rdp -f Makefile.osx
-	$(MAKE) -C xup -f Makefile.osx
-
-nopam: base
-	$(MAKE) -C sesman nopam
-	$(MAKE) -C sesman tools
-
-kerberos: base
-	$(MAKE) -C sesman -f Makefile.osx kerberos
-	$(MAKE) -C sesman -f Makefile.osx tools
-
-clean:
-	$(MAKE) -C vnc -f Makefile.osx clean
-	$(MAKE) -C libxrdp -f Makefile.osx clean
-	$(MAKE) -C xrdp -f Makefile.osx clean
-	$(MAKE) -C rdp -f Makefile.osx clean
-	$(MAKE) -C sesman -f Makefile.osx clean
-	$(MAKE) -C xup -f Makefile.osx clean
-
-install:
-	mkdir -p $(DESTDIR)
-	mkdir -p $(CFGDIR)
-	mkdir -p $(PIDDIR)
-	mkdir -p $(MANDIR)
-	mkdir -p $(DOCDIR)
-	$(MAKE) -C vnc install
-	$(MAKE) -C libxrdp install
-	$(MAKE) -C xrdp install
-	$(MAKE) -C rdp install
-	$(MAKE) -C sesman install
-	$(MAKE) -C xup install
-	$(MAKE) -C docs install
-	if [ -d /etc/pam.d ]; then install instfiles/pam.d/sesman/etc/pam.d/sesman; fi
-	install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index cef4003c..00000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-
-all: world
-
-world:
-
-install:
diff --git a/keygen/Makefile b/keygen/Makefile
deleted file mode 100755
index fd71b00b..00000000
--- a/keygen/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# libvnc makefile
-
-KEYGENOBJ = keygen.o os_calls.o ssl_calls.o list.o file.o
-
-DEFINES =
-
-BINDIR = /usr/local/bin
-
-CFLAGS = -Wall -O2 -I../common $(DEFINES)
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS =
-LIBS = -ldl -lcrypto
-CC = gcc
-
-all: xrdp-keygen
-
-xrdp-keygen: $(KEYGENOBJ)
-	$(CC) $(LDFLAGS) -o xrdp-keygen $(KEYGENOBJ) $(LIBS)
-
-clean:
-	rm -f $(KEYGENOBJ) xrdp-keygen
-
-install:
-	install xrdp-keygen $(BINDIR)/xrdp-keygen
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-ssl_calls.o: ../common/ssl_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.c
-
-file.o: ../common/file.c
-	$(CC) $(C_OS_FLAGS) ../common/file.c
diff --git a/libxrdp/Makefile b/libxrdp/Makefile
deleted file mode 100644
index 07647eba..00000000
--- a/libxrdp/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# libxrdp makefile
-
-LIBXRDPOBJ = libxrdp.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o \
-             xrdp_sec.o xrdp_rdp.o xrdp_orders.o \
-             xrdp_bitmap_compress.o xrdp_channel.o \
-             os_calls.o ssl_calls.o file.o
-
-CFGDIR = /etc/xrdp
-LIBDIR = /usr/local/lib/xrdp
-
-DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
-          -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -shared
-LIBS = -ldl
-LIBS += -lcrypto
-CC = gcc
-
-all: libxrdp.so
-
-static: $(LIBXRDPOBJ)
-	$(AR) rvu libxrdp.a $(LIBXRDPOBJ)
-	ranlib libxrdp.a
-
-libxrdp.so: $(LIBXRDPOBJ)
-	$(CC) $(LDFLAGS) -o libxrdp.so $(LIBXRDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so
-
-install:
-	install libxrdp.so $(LIBDIR)/libxrdp.so
-
-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
-
-ssl_calls.o: ../common/ssl_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
diff --git a/libxrdp/Makefile.osx b/libxrdp/Makefile.osx
deleted file mode 100644
index 68691baf..00000000
--- a/libxrdp/Makefile.osx
+++ /dev/null
@@ -1,48 +0,0 @@
-# libxrdp makefile
-LIBXRDPOBJ = libxrdp.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o \
-             xrdp_sec.o xrdp_rdp.o xrdp_orders.o \
-             xrdp_bitmap_compress.o xrdp_channel.o \
-             os_calls.o ssl_calls.o file.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
-          -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
-
-LIBXRDP = libxrdp.dylib
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -dynamiclib -Wl,-flat_namespace -Wl,-undefined -Wl,suppress
-LIBS = -lcrypto
-CC = gcc
-
-all: $(LIBXRDP)
-
-static: $(LIBXRDPOBJ)
-	$(AR) rvu libxrdp.a $(LIBXRDPOBJ)
-	ranlib libxrdp.a
-
-$(LIBXRDP): $(LIBXRDPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBXRDP) $(LIBXRDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(LIBXRDPOBJ) libxrdp.a $(LIBXRDP)
-
-install:
-	install $(LIBXRDP) $(DESTDIR)/$(LIBXRDP)
-
-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
-
-
-ssl_calls.o: ../common/ssl_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
diff --git a/libxrdp/makefile_win32 b/libxrdp/makefile_win32
deleted file mode 100755
index 93a44069..00000000
--- a/libxrdp/makefile_win32
+++ /dev/null
@@ -1,42 +0,0 @@
-# borland windows makefile
-#
-# this assumes openssl and borland free command line tools are installed
-# this assumes c:\windows is windows directory
-#
-# run 'set PATH=c:\borland\bcc55\bin' and run 'make -f makefile_win32 all'
-#
-
-XRDPOBJ = libxrdp.obj xrdp_tcp.obj xrdp_iso.obj xrdp_mcs.obj \
-          xrdp_sec.obj xrdp_rdp.obj xrdp_orders.obj \
-          xrdp_bitmap_compress.obj xrdp_channel.obj \
-          list.obj \
-          file.obj \
-          os_calls.obj \
-          ssl_calls.obj
-
-CFLAGS = -w- -O2 -I../common -Ic:/borland/bcc55/include -Ic:/openssl/include
-LDFLAGS = -Lc:/borland/bcc55/lib
-
-xrdp: $(XRDPOBJ)
-	$(CC) $(LDFLAGS) -WD -exrdp.dll libeay32.lib $(XRDPOBJ)
-
-all: lib xrdp
-
-clean:
-	del $(XRDPOBJ) xrdp.dll
-
-lib:
-	implib -a -w libeay32.lib c:/windows/system32/libeay32.dll
-
-list.obj:
-	$(CC) $(CFLAGS) -c ../common/list.c
-
-file.obj:
-	$(CC) $(CFLAGS) -c ../common/file.c
-
-os_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/os_calls.c
-
-ssl_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/ssl_calls.c
-
diff --git a/mc/Makefile b/mc/Makefile
deleted file mode 100644
index bc1fc12e..00000000
--- a/mc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# libmc makefile
-MCOBJ = os_calls.o mc.o
-
-DEFINES =
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -shared
-LIBS = -ldl
-CC = gcc
-
-all: mc1
-
-mc1: $(MCOBJ)
-	$(CC) $(LDFLAGS) -o libmc.so $(MCOBJ) $(LIBS)
-
-clean:
-	rm -f $(MCOBJ) libmc.so
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
diff --git a/rdp/Makefile b/rdp/Makefile
deleted file mode 100644
index 6ffbcb52..00000000
--- a/rdp/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# librdp makefile
-
-RDPOBJ = ssl_calls.o os_calls.o rdp.o rdp_tcp.o rdp_iso.o rdp_mcs.o rdp_sec.o \
-         rdp_orders.o rdp_bitmap.o rdp_rdp.o rdp_lic.o
-
-LIBDIR = /usr/local/lib/xrdp
-
-DEFINES =
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -shared
-LIBS = -ldl
-LIBS += -lcrypto
-CC = gcc
-
-all: librdp.so
-
-librdp.so: $(RDPOBJ)
-	$(CC) $(LDFLAGS) -o librdp.so $(RDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(RDPOBJ) librdp.so
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-ssl_calls.o: ../common/ssl_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
-
-install:
-	install librdp.so $(LIBDIR)/librdp.so
diff --git a/rdp/Makefile.osx b/rdp/Makefile.osx
deleted file mode 100644
index 1d7bc92a..00000000
--- a/rdp/Makefile.osx
+++ /dev/null
@@ -1,39 +0,0 @@
-# librdp makefile
-RDPOBJ = ssl_calls.o os_calls.o rdp.o rdp_tcp.o rdp_iso.o rdp_mcs.o rdp_sec.o \
-         rdp_orders.o rdp_bitmap.o rdp_rdp.o rdp_lic.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES =
-
-LIBRDP = librdb.dylib
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -dynamiclib -Wl,-flat_namespace -Wl,-undefined -Wl,suppress
-LIBS = -ldl
-LIBS += -lcrypto
-CC = gcc
-
-all: $(LIBRDP)
-
-$(LIBRDP): $(RDPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBRDP) $(RDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(RDPOBJ) $(LIBRDP)
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-ssl_calls.o: ../common/ssl_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
-
-install:
-	install $(LIBRDP) $(DESTDIR)/$(LIBRDP)
-
diff --git a/rdp/makefile_win32 b/rdp/makefile_win32
deleted file mode 100644
index ff1e4067..00000000
--- a/rdp/makefile_win32
+++ /dev/null
@@ -1,31 +0,0 @@
-# borland windows makefile
-#
-# this assumes openssl and borland free command line tools are installed
-# this assumes c:\windows is windows directory
-#
-# run 'set PATH=c:\borland\bcc55\bin' and run 'make -f makefile_win32 all'
-#
-
-RDPOBJ = rdp.obj rdp_tcp.obj rdp_iso.obj rdp_mcs.obj \
-         rdp_sec.obj rdp_rdp.obj rdp_orders.obj \
-         rdp_bitmap.obj rdp_lic.obj \
-         os_calls.obj \
-         ssl_calls.obj
-
-CFLAGS = -w- -O2 -I../common -Ic:/borland/bcc55/include
-LDFLAGS = -Lc:/borland/bcc55/lib
-
-rdp: $(RDPOBJ)
-	$(CC) $(LDFLAGS) -WD -erdp.dll $(RDPOBJ)
-
-all: rdp
-
-clean:
-	del $(XRDPOBJ) rdp.dll
-
-os_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/os_calls.c
-
-ssl_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/ssl_calls.c
-
diff --git a/sesman/Makefile b/sesman/Makefile
deleted file mode 100644
index 9d925ee1..00000000
--- a/sesman/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# sesman makefile
-
-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 scp_v1_mng.o thread.o lock.o
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-LIBDIR = /usr/local/lib/xrdp
-SBINDIR = /usr/local/sbin
-
-DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-          -DSESMAN_PID_FILE=\"$(PIDDIR)/xrdp-sesman.pid\" -DDEBUG
-
-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,$(LIBDIR) -lpthread -ldl -lscp
-C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
-all: libscp_ pam_base xrdp-sessvc_ tools_
-
-nopam: libscp_ no_pam_base xrdp-sessvc_ tools_
-
-pamuserpass: libscp_ pam_userpass_base xrdp-sessvc_ tools
-
-kerberos: libscp_ kerberos_base xrdp-sessvc_ tools
-
-pam_base: $(SESMANOBJ) verify_user_pam.o
-	$(CC) $(LDFLAGS) -o xrdp-sesman $(SESMANOBJ) verify_user_pam.o -lpam
-
-no_pam_base: $(SESMANOBJ) verify_user.o
-	make -C libscp
-	$(CC) $(LDFLAGS) -o xrdp-sesman $(SESMANOBJ) verify_user.o -lcrypt
-
-pam_userpass_base: $(SESMANOBJ) verify_user_pam_userpass.o
-	$(CC) $(LDFLAGS) -o xrdp-sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
-
-kerberos_base: $(SESMANOBJ) verify_user_kerberos.o
-	$(CC) $(LDFLAGS) -o xrdp-sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
-
-xrdp-sessvc_:
-	make -C sessvc
-
-tools_:
-	make -C tools
-
-libscp_:
-	make -C libscp
-
-clean:
-	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o verify_user_kerberos.o xrdp-sesman
-	make -C tools clean
-	make -C libscp clean
-	make -C sessvc clean
-
-install:
-	install xrdp-sesman $(SBINDIR)/xrdp-sesman
-	install startwm.sh $(CFGDIR)/startwm.sh
-	install sesman.ini $(CFGDIR)/sesman.ini
-	make -C tools install
-	make -C libscp install
-	make -C sessvc install
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-d3des.o: ../common/d3des.c
-	$(CC) $(C_OS_FLAGS) ../common/d3des.c
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.c
-
-file.o: ../common/file.c
-	$(CC) $(C_OS_FLAGS) ../common/file.c
-
-log.o: ../common/log.c
-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
-
diff --git a/sesman/Makefile.osx b/sesman/Makefile.osx
deleted file mode 100644
index 5e0b7255..00000000
--- a/sesman/Makefile.osx
+++ /dev/null
@@ -1,77 +0,0 @@
-# sesman $(MAKE)file
-
-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
-
-SESSVCOBJ = sessvc.o os_calls.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-         -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\"
-
-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-LDFLAGS = -L./libscp -lpthread -ldl -lscp
-C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
-all: libscp_ pam tools
-
-nopam: libscp_ no-pam tools
-
-kerberos: libscp_ kerberos-base tools
-
-no-pam: $(SESMANOBJ) verify_user.o
-	$(MAKE) -C libscp
-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
-
-pam: $(SESMANOBJ) verify_user_pam.o
-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
-
-pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
-
-kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
-
-sessvc: $(SESSVCOBJ)
-	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
-
-tools: sessvc
-	$(MAKE) -C tools -f Makefile.osx
-
-libscp_:
-	$(MAKE) -C libscp -f Makefile.osx
-
-clean:
-	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun sessvc.o sessvc
-	$(MAKE) -C tools -f Makefile.osx clean
-	$(MAKE) -C libscp -f Makefile.osx clean
-
-install:
-	install sesman $(DESTDIR)/sesman
-	install startwm.sh $(DESTDIR)/startwm.sh
-	install sesman.ini $(CFGDIR)/sesman.ini
-	install sessvc $(DESTDIR)/sessvc
-	$(MAKE) -C tools install
-	$(MAKE) -C libscp install
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-d3des.o: ../common/d3des.c
-	$(CC) $(C_OS_FLAGS) ../common/d3des.c
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.c
-
-file.o: ../common/file.c
-	$(CC) $(C_OS_FLAGS) ../common/file.c
-
-log.o: ../common/log.c
-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
diff --git a/sesman/libscp/Makefile b/sesman/libscp/Makefile
deleted file mode 100644
index 62702afc..00000000
--- a/sesman/libscp/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# libscp makefile
-LIBSCPOBJ = libscp_vX.o libscp_v0.o \
-	    libscp_v1s.o libscp_v1c.o \
-	    libscp_init.o libscp_lock.o libscp_tcp.o \
-	    libscp_session.o libscp_connection.o \
-	    os_calls.o \
-	    libscp_v1s_mng.o libscp_v1c_mng.o
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-LIBDIR = /usr/local/lib/xrdp
-
-LIBSCPLNAME = libscp.so
-LIBSCPSONAME = $(LIBSCPLNAME).1
-LIBSCPFNAME = $(LIBSCPSONAME).0.0
-
-DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-	  -DSESMAN_PID_FILE=\"$(PIDDIR)/xrdp-sesman.pid\" \
-	  -DSESMAN_SESSVC_FILE=\"xrdp-sessvc\"
-
-#CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
-CFLAGS = -Wall -g -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
-LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
-C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
-all: libscp.so
-
-libscp.so: $(LIBSCPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBSCPFNAME) $(LIBSCPOBJ)
-	ln -f -s $(LIBSCPFNAME) $(LIBSCPLNAME)
-
-clean:
-	rm -f $(LIBSCPOBJ) $(LIBSCPFNAME) $(LIBSCPLNAME)
-
-install:
-	install -D $(LIBSCPFNAME) $(LIBDIR)/$(LIBSCPFNAME)
-	ln -f -s $(LIBSCPFNAME) $(LIBDIR)/$(LIBSCPLNAME)
-
-os_calls.o: ../../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
diff --git a/sesman/libscp/Makefile.osx b/sesman/libscp/Makefile.osx
deleted file mode 100644
index d8750563..00000000
--- a/sesman/libscp/Makefile.osx
+++ /dev/null
@@ -1,45 +0,0 @@
-# libscp makefile
-LIBSCPOBJ = libscp_vX.o libscp_v0.o \
-           libscp_v1s.o libscp_v1c.o \
-           libscp_init.o libscp_lock.o libscp_tcp.o \
-           libscp_session.o libscp_connection.o \
-           os_calls.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DESTDIRDEB = /tmp
-
-LIBSCPLNAME = libscp.dylib
-LIBSCPSONAME = libscp.1.dylib
-LIBSCPFNAME = libscp.0.0.dylib
-
-DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-         -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
-         -DSESMAN_SESSVC_FILE=\"sessvc\"
-
-CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC -fno-common $(DEFINES)
-LDFLAGS = -dynamiclib -Wl,-flat_namespace -Wl,-undefined -Wl,suppress -lpthread
-C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
-all: $(LIBSCPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBSCPFNAME) $(LIBSCPOBJ)
-	ln -f -s $(LIBSCPFNAME) $(LIBSCPLNAME)
-
-clean:
-	rm -f $(LIBSCPOBJ) $(LIBSCPFNAME) $(LIBSCPLNAME)
-
-install:
-	install $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPFNAME)
-	ln -f -s $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPLNAME)
-
-installdeb:
-	install $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPFNAME)
-	ln -f -s $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
-
-os_calls.o: ../../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
diff --git a/sesman/sessvc/Makefile b/sesman/sessvc/Makefile
deleted file mode 100644
index 39905e94..00000000
--- a/sesman/sessvc/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-
-SESSVCOBJ = sessvc.o os_calls.o log.o
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-LIBDIR = /usr/local/lib/xrdp
-SBINDIR = /usr/local/sbin
-
-CFLAGS = -Wall -O2 -I../../common
-LDFLAGS = -lpthread -ldl
-C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
-all: xrdp-sessvc
-
-xrdp-sessvc: $(SESSVCOBJ)
-	$(CC) $(LDFLAGS) -o xrdp-sessvc $(SESSVCOBJ)
-
-clean:
-	rm -f $(SESSVCOBJ) xrdp-sessvc
-
-install:
-	install xrdp-sessvc $(SBINDIR)/xrdp-sessvc
-
-os_calls.o: ../../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
-
-log.o: ../../common/log.c
-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../../common/log.c
diff --git a/sesman/tools/Makefile b/sesman/tools/Makefile
deleted file mode 100644
index 65705fc6..00000000
--- a/sesman/tools/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# sesman tools makefile
-SESTESTOBJ = sestest.o \
-            os_calls.o log.o
-#	    d3des.o list.o file.o \
-#            libscp_v1c.o tcp.o
-
-SESRUNOBJ = sesrun.o config.o tcp.o \
-            os_calls.o d3des.o list.o file.o log.o
-
-SESADMINOBJ = sesadmin.o \
-	      os_calls.o log.o
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-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 -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
-CC = gcc
-
-all: xrdp-sestest xrdp-sesrun xrdp-sesadmin
-
-xrdp-sestest: $(SESTESTOBJ)
-	$(CC) $(LDFLAGS) -o xrdp-sestest $(SESTESTOBJ)
-
-xrdp-sesrun: $(SESRUNOBJ)
-	$(CC) $(LDFLAGS) -o xrdp-sesrun $(SESRUNOBJ)
-
-xrdp-sesadmin: $(SESADMINOBJ)
-	$(CC) $(LDFLAGS) -o xrdp-sesadmin $(SESADMINOBJ)
-
-clean:
-	rm -f *.o xrdp-sestest xrdp-sesrun xrdp-sesadmin
-
-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
-	$(CC) $(C_OS_FLAGS) ../../common/list.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
-
-config.o: ../config.c
-	$(CC) $(C_OS_FLAGS) ../config.c
diff --git a/sesman/tools/Makefile.osx b/sesman/tools/Makefile.osx
deleted file mode 100644
index 61de0e6b..00000000
--- a/sesman/tools/Makefile.osx
+++ /dev/null
@@ -1,65 +0,0 @@
-# sesman tools makefile
-SESTESTOBJ = sestest.o \
-            os_calls.o
-#          d3des.o list.o file.o \
-#            libscp_v1c.o tcp.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
-
-DEFINES = -DLIBSCP_CLIENT
-
-CFLAGS = -Wall -O2 -I../../common -I../ -I../libscp $(DEFINES)
-LDFLAGS = -L../libscp -lpthread -ldl -lscp $(DEFINES)
-#LDFLAGS = -L /usr/gnu/lib -ldl $(DEFINES)
-C_OS_FLAGS = $(CFLAGS) -c -g
-CC = gcc
-
-all: stest srun
-
-stest: $(SESTESTOBJ)
-	$(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
-
-srun: $(SESRUNOBJ)
-	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
-
-os_calls.o: ../../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
-
-#d3des.o: ../../common/d3des.c
-#	$(CC) $(C_OS_FLAGS) ../../common/d3des.c
-
-#list.o: ../../common/list.c
-#	$(CC) $(C_OS_FLAGS) ../../common/list.c
-
-#file.o: ../../common/file.c
-#       $(CC) $(C_OS_FLAGS) ../../common/file.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
diff --git a/vnc/Makefile b/vnc/Makefile
deleted file mode 100644
index 3ec46ffc..00000000
--- a/vnc/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# libvnc makefile
-
-VNCOBJ = vnc.o os_calls.o d3des.o
-
-LIBDIR = /usr/local/lib/xrdp
-
-DEFINES =
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-C_OS_FLAGS = $(CFLAGS) -c -g
-LDFLAGS = -shared
-LIBS = -ldl
-CC = gcc
-
-all: libvnc.so
-
-libvnc.so: $(VNCOBJ)
-	$(CC) $(LDFLAGS) -o libvnc.so $(VNCOBJ) $(LIBS)
-
-clean:
-	rm -f $(VNCOBJ) libvnc.so
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-d3des.o: ../common/d3des.c
-	$(CC) $(C_OS_FLAGS) ../common/d3des.c
-
-install:
-	install libvnc.so $(LIBDIR)/libvnc.so
diff --git a/vnc/Makefile.osx b/vnc/Makefile.osx
deleted file mode 100644
index 158daa0c..00000000
--- a/vnc/Makefile.osx
+++ /dev/null
@@ -1,37 +0,0 @@
-# libvnc makefile
-
-VNCOBJ = vnc.o os_calls.o d3des.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES =
-
-VNCLIB = libvnc.dylib
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-C_OS_FLAGS = $(CFLAGS) -c -g
-LDFLAGS = -dynamiclib -Wl,-flat_namespace -Wl,-undefined -Wl,suppress
-LIBS =
-CC = gcc
-
-all: $(VNCLIB)
-
-$(VNCLIB): $(VNCOBJ)
-	$(CC) $(LDFLAGS) -o $(VNCLIB) $(VNCOBJ) $(LIBS)
-
-clean:
-	rm -f $(VNCOBJ) $(VNCLIB)
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-d3des.o: ../common/d3des.c
-	$(CC) $(C_OS_FLAGS) ../common/d3des.c
-
-install:
-	install $(VNCLIB) $(DESTDIR)/$(VNCLIB)
-
diff --git a/vnc/makefile_win32 b/vnc/makefile_win32
deleted file mode 100755
index 69b6fcfc..00000000
--- a/vnc/makefile_win32
+++ /dev/null
@@ -1,25 +0,0 @@
-# borland windows makefile
-#
-# this assumes openssl and borland free command line tools are installed
-# this assumes c:\windows is windows directory
-#
-# run 'set PATH=c:\borland\bcc55\bin' and run 'make -f makefile_win32 all'
-#
-
-VNCOBJ = vnc.obj os_calls.obj d3des.obj
-CFLAGS = -w- -O2 -I../common -Ic:/borland/bcc55/include
-LDFLAGS = -Lc:/borland/bcc55/lib
-
-all: vnc
-
-vnc: $(VNCOBJ)
-	$(CC) $(LDFLAGS) -WD -evnc.dll $(VNCOBJ)
-
-clean:
-	del $(VNCOBJ) vnc.dll
-
-os_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/os_calls.c
-
-d3des.obj:
-	$(CC) $(CFLAGS) -c ../common/d3des.c
diff --git a/xrdp/Makefile b/xrdp/Makefile
deleted file mode 100644
index 2579f3cd..00000000
--- a/xrdp/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# xrdp makefile
-XRDPOBJ = xrdp.o xrdp_process.o xrdp_listen.o \
-          xrdp_bitmap.o xrdp_wm.o xrdp_painter.o \
-          xrdp_region.o xrdp_cache.o xrdp_font.o funcs.o \
-          xrdp_login_wnd.o lang.o \
-          list.o file.o os_calls.o thread_calls.o \
-          xrdp_mm.o
-
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-LIBDIR = /usr/local/lib/xrdp
-BINDIR = /usr/local/bin
-SBINDIR = /usr/local/sbin
-SHAREDIR = /usr/local/share/xrdp
-
-DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
-          -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
-
-CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,$(LIBDIR)
-LIBS = -ldl -lpthread -lxrdp
-CC = gcc
-
-all: xrdp
-
-xrdp: $(XRDPOBJ)
-	$(CC) $(LDFLAGS) -o xrdp $(XRDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(XRDPOBJ) xrdp
-
-install:
-	install ad256.bmp $(SHAREDIR)/ad256.bmp
-	install xrdp256.bmp $(SHAREDIR)/xrdp256.bmp
-	install cursor0.cur $(SHAREDIR)/cursor0.cur
-	install cursor1.cur $(SHAREDIR)/cursor1.cur
-	install sans-10.fv1 $(SHAREDIR)/sans-10.fv1
-	install xrdp.ini $(CFGDIR)/xrdp.ini
-	install rsakeys.ini $(CFGDIR)/rsakeys.ini
-	install xrdp $(SBINDIR)/xrdp
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.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
-
-thread_calls.o: ../common/thread_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/thread_calls.c
diff --git a/xrdp/Makefile.osx b/xrdp/Makefile.osx
deleted file mode 100644
index fcedc806..00000000
--- a/xrdp/Makefile.osx
+++ /dev/null
@@ -1,53 +0,0 @@
-# xrdp makefile
-XRDPOBJ = xrdp.o xrdp_process.o xrdp_listen.o \
-          xrdp_bitmap.o xrdp_wm.o xrdp_painter.o \
-          xrdp_region.o xrdp_cache.o xrdp_font.o funcs.o \
-          xrdp_login_wnd.o lang.o \
-          list.o file.o os_calls.o thread_calls.o \
-          xrdp_mm.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
-          -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
-
-CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -L../libxrdp
-LIBS = -ldl -lpthread -lxrdp -lcrypto
-CC = gcc
-
-all: xrdp
-
-xrdp: $(XRDPOBJ)
-	$(CC) $(LDFLAGS) -o xrdp $(XRDPOBJ) $(LIBS)
-
-clean:
-	rm -f $(XRDPOBJ) xrdp
-
-install:
-	install ad256.bmp $(DESTDIR)/ad256.bmp
-	install xrdp256.bmp $(DESTDIR)/xrdp256.bmp
-	install cursor0.cur $(DESTDIR)/cursor0.cur
-	install cursor1.cur $(DESTDIR)/cursor1.cur
-	install sans-10.fv1 $(DESTDIR)/sans-10.fv1
-	install xrdp.ini $(CFGDIR)/xrdp.ini
-	install rsakeys.ini $(CFGDIR)/rsakeys.ini
-	install xrdp $(DESTDIR)/xrdp
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.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
-
-thread_calls.o: ../common/thread_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/thread_calls.c
diff --git a/xrdp/makefile_win32 b/xrdp/makefile_win32
deleted file mode 100644
index 5d62472b..00000000
--- a/xrdp/makefile_win32
+++ /dev/null
@@ -1,44 +0,0 @@
-# borland windows makefile
-#
-# this assumes openssl and borland free command line tools are installed
-# this assumes c:\windows is windows directory
-#
-# run 'set PATH=c:\borland\bcc55\bin' and run 'make -f makefile_win32 all'
-#
-
-XRDPOBJ = xrdp.obj xrdp_process.obj xrdp_listen.obj \
-          xrdp_bitmap.obj xrdp_wm.obj xrdp_painter.obj \
-          xrdp_region.obj xrdp_cache.obj xrdp_font.obj funcs.obj \
-          xrdp_login_wnd.obj xrdp_interface.obj \
-          list.obj \
-          file.obj \
-          os_calls.obj \
-          thread_calls.obj
-
-CFLAGS = -w- -O2 -I../common -Ic:/borland/bcc55/include -Ic:/openssl/include -I../libxrdp
-LDFLAGS = -Lc:/borland/bcc55/lib
-
-xrdp: $(XRDPOBJ)
-	$(CC) $(LDFLAGS) libeay32.lib xrdp.lib $(XRDPOBJ)
-
-all: lib xrdp
-
-clean:
-	del $(XRDPOBJ) xrdp.exe
-
-lib:
-	implib -a -w libeay32.lib c:/windows/system32/libeay32.dll
-	implib -w xrdp.lib ../libxrdp/xrdp.dll
-
-list.obj:
-	$(CC) $(CFLAGS) -c ../common/list.c
-
-file.obj:
-	$(CC) $(CFLAGS) -c ../common/file.c
-
-os_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/os_calls.c
-
-thread_calls.obj:
-	$(CC) $(CFLAGS) -c ../common/thread_calls.c
-
diff --git a/xup/Makefile b/xup/Makefile
deleted file mode 100644
index 08006f70..00000000
--- a/xup/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# libxup makefile
-
-XUPOBJ = os_calls.o xup.o
-
-LIBDIR = /usr/local/lib/xrdp
-
-DEFINES =
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -shared
-LIBS = -ldl
-CC = gcc
-
-all: libxup.so
-
-libxup.so: $(XUPOBJ)
-	$(CC) $(LDFLAGS) -o libxup.so $(XUPOBJ) $(LIBS)
-
-clean:
-	rm -f $(XUPOBJ) libxup.so
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-install:
-	install libxup.so $(LIBDIR)/libxup.so
diff --git a/xup/Makefile.osx b/xup/Makefile.osx
deleted file mode 100644
index 9f0f4f7c..00000000
--- a/xup/Makefile.osx
+++ /dev/null
@@ -1,35 +0,0 @@
-# libxup makefile
-
-XUPOBJ = os_calls.o xup.o
-
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
-DEFINES =
-
-LIBXUP = libxup.dylib
-
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-#CFLAGS += -DXRDP_DEBUG
-C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -dynamiclib -Wl,-flat_namespace -Wl,-undefined -Wl,suppress
-LIBS = -ldl
-CC = gcc
-
-all: $(LIBXUP)
-
-$(LIBXUP): $(XUPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBXUP) $(XUPOBJ) $(LIBS)
-
-clean:
-	rm -f $(XUPOBJ) $(LIBXUP)
-
-os_calls.o: ../common/os_calls.c
-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
-install:
-	install $(LIBXUP) $(DESTDIR)/$(LIBXUP)
-