Makefile changes

7 files changed, 108 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index e5ffd8ed..48fee44b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,26 @@
 
 DESTDIR = /usr/local/xrdp
+CFGDIR = /etc/xrdp
+PIDDIR = /var/run
+MANDIR = /usr/local/man
+DOCDIR = /usr/doc/xrdp
 
 all: world
 
-world:
+world: base
+	make -C sesman
+
+base:
 	make -C vnc
 	make -C libxrdp
 	make -C xrdp
 	make -C rdp
-	make -C sesman
+
+nopam: base
+	make -C sesman nopam
+
+kerberos: base
+	make -C sesman kerberos
 
 clean:
 	make -C vnc clean
@@ -19,20 +31,14 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)
-	install xrdp/xrdp $(DESTDIR)/xrdp
-	install libxrdp/libxrdp.so $(DESTDIR)/libxrdp.so
-	install xrdp/ad256.bmp $(DESTDIR)/ad256.bmp
-	install xrdp/xrdp256.bmp $(DESTDIR)/xrdp256.bmp
-	install xrdp/cursor0.cur $(DESTDIR)/cursor0.cur
-	install xrdp/cursor1.cur $(DESTDIR)/cursor1.cur
-	install xrdp/Tahoma-10.fv1 $(DESTDIR)/Tahoma-10.fv1
-	install vnc/libvnc.so $(DESTDIR)/libvnc.so
-	install sesman/sesman $(DESTDIR)/sesman
-	install sesman/sesrun $(DESTDIR)/sesrun
-	install instfiles/sesman.ini $(DESTDIR)/sesman.ini
-	install instfiles/startwm.sh $(DESTDIR)/startwm.sh
-	install instfiles/xrdp.ini $(DESTDIR)/xrdp.ini
-	install instfiles/xrdpstart.sh $(DESTDIR)/xrdpstart.sh
-	install instfiles/pam.d/sesman /etc/pam.d/sesman
-	install xrdp/rsakeys.ini $(DESTDIR)/rsakeys.ini
-	install rdp/librdp.so $(DESTDIR)/librdp.so
+	mkdir -p $(CONFDIR)
+	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 docs install
+#	install instfiles/pam.d/sesman /etc/pam.d/sesman
diff --git a/libxrdp/Makefile b/libxrdp/Makefile
index 437b2af3..097785d7 100644
--- a/libxrdp/Makefile
+++ b/libxrdp/Makefile
@@ -1,10 +1,18 @@
-
+# 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 \
              os_calls.o ssl_calls.o file.o
 
-CFLAGS = -Wall -O2 -I../common -fPIC
+DESTDIR = /usr/local/xrdp
+CFGDIR = /etc/xrdp
+PIDDIR = /var/run
+MANDIR = /usr/local/man
+DOCDIR = /usr/doc/xrdp
+
+DEFINES =
+
+CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
 LIBS = -ldl
@@ -24,6 +32,9 @@ libxrdp: $(LIBXRDPOBJ)
 clean:
 	rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so
 
+install:
+	install libxrdp.so $(DESTDIR)/libxrdp.so
+
 file.o:
 	$(CC) $(C_OS_FLAGS) ../common/file.c
 
diff --git a/rdp/Makefile b/rdp/Makefile
index 7680c1f8..b9f87ee7 100644
--- a/rdp/Makefile
+++ b/rdp/Makefile
@@ -1,7 +1,16 @@
-
+# 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
-CFLAGS = -Wall -O2 -I../common -fPIC
+
+DESTDIR = /usr/local/xrdp
+CFGDIR = /etc/xrdp
+PIDDIR = /var/run
+MANDIR = /usr/local/man
+DOCDIR = /usr/doc/xrdp
+
+DEFINES =
+
+CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
@@ -23,3 +32,5 @@ os_calls.o:
 ssl_calls.o:
 	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
 
+install:
+	install librdp.so $(DESTDIR)/librdp.so
diff --git a/sesman/Makefile b/sesman/Makefile
index be607b6f..3bf8276d 100644
--- a/sesman/Makefile
+++ b/sesman/Makefile
@@ -1,15 +1,25 @@
-
+# sesman makefile
 SESMANOBJ = sesman.o config.o tcp.o sig.o session.o env.o \
             os_calls.o d3des.o list.o file.o log.o
 
 SESRUNOBJ = sesrun.o config.o tcp.o \
             os_calls.o d3des.o list.o file.o log.o
 
-CFLAGS = -Wall -O2 -I../common
+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 $(DEFINES)
 LDFLAGS = -L /usr/gnu/lib
 C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
 
+
 all: pam tools
 
 nopam: $(SESMANOBJ) verify_user.o
@@ -28,7 +38,14 @@ tools: $(SESRUNOBJ)
 	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) -ldl
 
 clean:
-	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o verify_user_kerberos.o sesman sesrun.o sesrun
+	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun
+
+install:
+	install sesman $(DESTDIR)/sesman
+	install sesrun $(DESTDIR)/sesrun
+	install startwm.sh $(CFGDIR)/startwm.sh
+	install sesman.ini $(CFGDIR)/sesman.ini
+	install pam.d/sesman /etc/pam.d/sesman
 
 os_calls.o:
 	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
diff --git a/sesman/config.h b/sesman/config.h
index 0feba75d..81a54959 100644
--- a/sesman/config.h
+++ b/sesman/config.h
@@ -32,7 +32,9 @@
  * @brief Configuration file path
  * 
  */
+#ifndef SESMAN_CFG_FILE
 #define SESMAN_CFG_FILE              "./sesman.ini"
+#endif
 
 #define SESMAN_CFG_GLOBALS           "Globals"
 #define SESMAN_CFG_DEFWM             "DefaultWindowManager"
diff --git a/vnc/Makefile b/vnc/Makefile
index a37edd88..cd9df297 100644
--- a/vnc/Makefile
+++ b/vnc/Makefile
@@ -1,6 +1,15 @@
-
+# libvnc makefile
 VNCOBJ = vnc.o os_calls.o d3des.o
-CFLAGS = -Wall -O2 -I../common -fPIC
+
+DESTDIR = /usr/local/xrdp
+CFGDIR = /etc/xrdp
+PIDDIR = /var/run
+MANDIR = /usr/local/man
+DOCDIR = /usr/doc/xrdp
+
+DEFINES =
+
+CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
 LIBS = -ldl
@@ -19,3 +28,7 @@ os_calls.o:
 
 d3des.o:
 	$(CC) $(C_OS_FLAGS) ../common/d3des.c
+
+install:
+	install libvnc.so $(DESTDIR)/libvnc.so
+
diff --git a/xrdp/Makefile b/xrdp/Makefile
index e1e52005..6efc891b 100644
--- a/xrdp/Makefile
+++ b/xrdp/Makefile
@@ -5,8 +5,16 @@ XRDPOBJ = xrdp.o xrdp_process.o xrdp_listen.o \
           xrdp_login_wnd.o xrdp_interface.o \
           list.o file.o os_calls.o thread_calls.o
 
-#CFLAGS = -Wall -O2 -I../common -I../libxrdp -DXRDP_DEBUG
-CFLAGS = -Wall -O2 -I../common -I../libxrdp
+DESTDIR = /usr/local/xrdp
+CFGDIR = /etc/xrdp
+PIDDIR = /var/run
+MANDIR = /usr/local/man
+DOCDIR = /usr/doc/xrdp
+
+DEFINES =
+
+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,.
 LIBS = -ldl -lpthread -lxrdp
@@ -21,6 +29,16 @@ xrdp: $(XRDPOBJ)
 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 Tahoma-10.fv1 $(DESTDIR)/Tahoma-10.fv1
+	install xrdp.ini $(CFGDIR)/xrdp.ini
+	install xrdpstart.sh $(DESTDIR)/xrdpstart.sh
+	install rsakeys.ini $(CFGDIR)/rsakeys.ini
+
 list.o:
 	$(CC) $(C_OS_FLAGS) ../common/list.c