aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-05 18:07:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-22 22:42:39 +0200
commit49fc383a4107062a843bc0c3a8fd9cae7e20e032 (patch)
tree8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /nx-X11/lib/X11
parenta5bb888248b3887bbe306505f900368b931b7f18 (diff)
downloadnx-libs-49fc383a4107062a843bc0c3a8fd9cae7e20e032.tar.gz
nx-libs-49fc383a4107062a843bc0c3a8fd9cae7e20e032.tar.bz2
nx-libs-49fc383a4107062a843bc0c3a8fd9cae7e20e032.zip
library clean-up: Don't build libNX_Xdmcp anymore. Use system's libXdmcp shared library.
Diffstat (limited to 'nx-X11/lib/X11')
-rw-r--r--nx-X11/lib/X11/Imakefile11
1 files changed, 1 insertions, 10 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 4e781f59c..e00351169 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -120,8 +120,6 @@ EXTRA_LIBRARIES = /**/
#endif
#if HasXdmAuth
XDMAUTHDEFS = -DHASXDMAUTH
- XDMAUTHOBJS = Wrap.o Wraphelp.o
- XDMAUTHSRCS = Wrap.c Wraphelp.c
#endif
#if BuildXKBlib
XKB_DEFINES = -DXKB
@@ -593,7 +591,7 @@ SRCS2 = \
Withdraw.c \
WMGeom.c \
WMProps.c \
- $(AUTHSRCS) $(XDMAUTHSRCS) $(K5SRCS) $(THRSTUBSRCS)
+ $(AUTHSRCS) $(K5SRCS) $(THRSTUBSRCS)
OBJS2 = \
Macros.o \
@@ -716,7 +714,6 @@ OBJS2 = \
WMGeom.o \
WMProps.o \
$(AUTHOBJS) \
- $(XDMAUTHOBJS) \
$(K5OBJS) \
$(THRSTUBOBJS)
@@ -1069,7 +1066,6 @@ LinkFile(x11trans.c,$(TRANSCOMMSRC)/transport.c)
SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
-SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
@@ -1116,11 +1112,6 @@ LinkSourceFile(AuRead.c,$(XAUTHSRC))
#if HasKrb5
LinkSourceFile(k5encode.c,$(XAUTHSRC))
#endif
-#if HasXdmAuth
-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
-LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
-LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
-#endif
#ifdef QNX4Architecture
LOCAL_LDFLAGS=-F