diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
| commit | bb9571d3ede4adbb9396fdb25ab8e3e91aba1479 (patch) | |
| tree | 8e21e43376a5b106a5d9689a4349385101263325 /libX11/src/Makefile.am | |
| parent | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (diff) | |
| parent | f56cfbb54588917d9566277a669fa086a842b2f5 (diff) | |
| download | vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.gz vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.bz2 vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/Makefile.am')
| -rw-r--r-- | libX11/src/Makefile.am | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am index a433fa78a..d3ab2ecb3 100644 --- a/libX11/src/Makefile.am +++ b/libX11/src/Makefile.am @@ -3,7 +3,7 @@ XKB_SUBDIRS = xkb endif
SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
-lib_LTLIBRARIES=libX11.la
+lib_LTLIBRARIES = libX11.la libX11-xcb.la
BUILT_SOURCES=ks_tables.h
CLEANFILES=ks_tables.h ks_tables_h
@@ -21,7 +21,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
@@ -312,6 +311,8 @@ libX11_la_SOURCES = \ WMProps.c \
WrBitF.c \
Xatomtype.h \
+ xcb_disp.c \
+ xcb_io.c \
Xintatom.h \
Xintconn.h \
XlibAsync.c \
@@ -320,7 +321,8 @@ libX11_la_SOURCES = \ XomGeneric.h \
Xresinternal.h \
Xrm.c \
- XrmI.h
+ XrmI.h \
+ Xxcbint.h
#
# ========================= Extra stuff ============================
@@ -347,21 +349,9 @@ EXTRA_DIST = \ udcInf.c \
UIThrStubs.c
-if XCB
-libX11_la_SOURCES += \
- xcb_disp.c \
- xcb_io.c \
- Xxcbint.h
-
-lib_LTLIBRARIES += libX11-xcb.la
libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
libX11_xcb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libX11_xcb_la_LIBADD = libX11.la
-else
-libX11_la_SOURCES += \
- ConnDis.c \
- x11_trans.c
-endif
#
# Figure out which sub-libraries to link into Xlib
@@ -385,8 +375,7 @@ libX11_la_LIBADD = \ $(USE_I18N_LIBS) \
$(USE_XCMS_LIBS) \
$(USE_XKB_LIBS) \
- $(X11_LIBS) \
- $(XDMCP_LIBS)
+ $(X11_LIBS)
preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
.c.ii:
|