[patch] based on xrdp-0.3.1, added xup and libscp modifications

xrdp-0.4.1-respect-cflags.patch (text/plain), 2.75 KB, created by Theunis on 2008-12-10 10:26:55 UTC

diff -ur xrdp-0.4.1.orig/libxrdp/Makefile xrdp-0.4.1/libxrdp/Makefile
--- xrdp-0.4.1.orig/libxrdp/Makefile	2007-04-08 23:19:42.000000000 +0200
+++ xrdp-0.4.1/libxrdp/Makefile	2008-12-09 17:24:31.229605896 +0200
@@ -13,7 +13,7 @@
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
           -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
diff -ur xrdp-0.4.1.orig/rdp/Makefile xrdp-0.4.1/rdp/Makefile
--- xrdp-0.4.1.orig/rdp/Makefile	2006-08-07 08:03:17.000000000 +0200
+++ xrdp-0.4.1/rdp/Makefile	2008-12-09 17:24:16.302105884 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
diff -ur xrdp-0.4.1.orig/sesman/Makefile xrdp-0.4.1/sesman/Makefile
--- xrdp-0.4.1.orig/sesman/Makefile	2007-05-28 01:30:34.000000000 +0200
+++ xrdp-0.4.1/sesman/Makefile	2008-12-09 17:24:03.779606027 +0200
@@ -16,7 +16,7 @@
 	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
+CFLAGS = $(MYCFLAGS) -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
 C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
diff -ur xrdp-0.4.1.orig/vnc/Makefile xrdp-0.4.1/vnc/Makefile
--- xrdp-0.4.1.orig/vnc/Makefile	2007-05-12 06:19:43.000000000 +0200
+++ xrdp-0.4.1/vnc/Makefile	2008-12-09 17:25:15.679605600 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES)
 C_OS_FLAGS = $(CFLAGS) -c -g
 LDFLAGS = -shared
 LIBS = -ldl
diff -ur xrdp-0.4.1.orig/xrdp/Makefile xrdp-0.4.1/xrdp/Makefile
--- xrdp-0.4.1.orig/xrdp/Makefile	2007-04-13 05:50:59.000000000 +0200
+++ xrdp-0.4.1/xrdp/Makefile	2008-12-09 17:25:45.659606072 +0200
@@ -15,7 +15,7 @@
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
           -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
 
-CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
+CFLAGS = $(MYCFLAGS) -I../common -I../libxrdp $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
diff -ur xrdp-0.4.1.orig/xup/Makefile xrdp-0.4.1/xup/Makefile
--- xrdp-0.4.1.orig/xup/Makefile	2007-05-12 06:20:14.000000000 +0200
+++ xrdp-0.4.1/xup/Makefile	2008-12-09 17:26:27.809605599 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared