← Back to branch summary

~ubuntu-branches/ubuntu/wily/libx11/wily-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-02-24 12:02:14 UTC
  • mfrom: (1.1.12 upstream) (2.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110224120214-a86d0lv48wk8itl6
Tags: 2:1.4.1-5ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add Latin locale.
  - Add Klingon locale.
  - Add 102_double_arrows_Compose.patch: compose keys for double arrows
    (LP: 680143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.in
42
42
@OS2_TRUE@am__append_1 = os2Stubs.c
43
43
@UDC_TRUE@am__append_2 = udcInf.c
44
44
@THRSTUBS_TRUE@am__append_3 = UIThrStubs.c
45
 
@XCB_TRUE@am__append_4 = \
46
 
@XCB_TRUE@                  xcb_disp.c \
47
 
@XCB_TRUE@                  xcb_io.c \
48
 
@XCB_TRUE@                  Xxcbint.h
49
 
 
50
 
@XCB_TRUE@am__append_5 = libX11-xcb.la
51
 
@XCB_FALSE@am__append_6 = \
52
 
@XCB_FALSE@                  ConnDis.c \
53
 
@XCB_FALSE@                  x11_trans.c
54
 
 
55
 
@MAKE_LINT_LIB_TRUE@am__append_7 = $(lintlib_DATA)
 
45
@MAKE_LINT_LIB_TRUE@am__append_4 = $(lintlib_DATA)
56
46
subdir = src
57
47
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
58
48
        $(srcdir)/config.h.in
59
49
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
60
 
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 
50
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
61
51
        $(top_srcdir)/configure.ac
62
52
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
63
53
        $(ACLOCAL_M4)
89
79
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" \
90
80
        "$(DESTDIR)$(x11datadir)"
91
81
LTLIBRARIES = $(lib_LTLIBRARIES)
92
 
@XCB_TRUE@libX11_xcb_la_DEPENDENCIES = libX11.la
93
 
am__libX11_xcb_la_SOURCES_DIST = x11_xcb.c Xxcbint.h
94
 
@XCB_TRUE@am_libX11_xcb_la_OBJECTS = x11_xcb.lo
 
82
libX11_xcb_la_DEPENDENCIES = libX11.la
 
83
am_libX11_xcb_la_OBJECTS = x11_xcb.lo
95
84
libX11_xcb_la_OBJECTS = $(am_libX11_xcb_la_OBJECTS)
96
85
AM_V_lt = $(am__v_lt_$(V))
97
86
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
99
88
libX11_xcb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
100
89
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
101
90
        $(libX11_xcb_la_LDFLAGS) $(LDFLAGS) -o $@
102
 
@XCB_TRUE@am_libX11_xcb_la_rpath = -rpath $(libdir)
103
91
am__DEPENDENCIES_1 =
104
92
libX11_la_DEPENDENCIES = $(USE_I18N_LIBS) $(USE_XCMS_LIBS) \
105
 
        $(USE_XKB_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 
93
        $(USE_XKB_LIBS) $(am__DEPENDENCIES_1)
106
94
am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \
107
95
        AutoRep.c Backgnd.c BdrWidth.c Bell.c Border.c ChAccCon.c \
108
96
        ChActPGb.c ChClMode.c ChCmap.c ChGC.c ChKeyCon.c ChkIfEv.c \
150
138
        TrCoords.c UndefCurs.c UngrabBut.c UngrabKbd.c UngrabKey.c \
151
139
        UngrabPtr.c UngrabSvr.c UninsCmap.c UnldFont.c UnmapSubs.c \
152
140
        UnmapWin.c utlist.h VisUtil.c WarpPtr.c Window.c WinEvent.c \
153
 
        Withdraw.c WMGeom.c WMProps.c WrBitF.c Xatomtype.h Xintatom.h \
154
 
        Xintconn.h XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h \
155
 
        Xresinternal.h Xrm.c XrmI.h os2Stubs.c udcInf.c UIThrStubs.c \
156
 
        xcb_disp.c xcb_io.c Xxcbint.h ConnDis.c x11_trans.c
 
141
        Withdraw.c WMGeom.c WMProps.c WrBitF.c Xatomtype.h xcb_disp.c \
 
142
        xcb_io.c Xintatom.h Xintconn.h XlibAsync.c XlibInt.c \
 
143
        Xprivate.h XomGeneric.h Xresinternal.h Xrm.c XrmI.h Xxcbint.h \
 
144
        os2Stubs.c udcInf.c UIThrStubs.c
157
145
@OS2_TRUE@am__objects_1 = os2Stubs.lo
158
146
@UDC_TRUE@am__objects_2 = udcInf.lo
159
147
@THRSTUBS_TRUE@am__objects_3 = UIThrStubs.lo
160
 
@XCB_TRUE@am__objects_4 = xcb_disp.lo xcb_io.lo
161
 
@XCB_FALSE@am__objects_5 = ConnDis.lo x11_trans.lo
162
148
am_libX11_la_OBJECTS = AllCells.lo AllowEv.lo AllPlanes.lo AutoRep.lo \
163
149
        Backgnd.lo BdrWidth.lo Bell.lo Border.lo ChAccCon.lo \
164
150
        ChActPGb.lo ChClMode.lo ChCmap.lo ChGC.lo ChKeyCon.lo \
211
197
        UngrabKey.lo UngrabPtr.lo UngrabSvr.lo UninsCmap.lo \
212
198
        UnldFont.lo UnmapSubs.lo UnmapWin.lo VisUtil.lo WarpPtr.lo \
213
199
        Window.lo WinEvent.lo Withdraw.lo WMGeom.lo WMProps.lo \
214
 
        WrBitF.lo XlibAsync.lo XlibInt.lo Xrm.lo $(am__objects_1) \
215
 
        $(am__objects_2) $(am__objects_3) $(am__objects_4) \
216
 
        $(am__objects_5)
 
200
        WrBitF.lo xcb_disp.lo xcb_io.lo XlibAsync.lo XlibInt.lo Xrm.lo \
 
201
        $(am__objects_1) $(am__objects_2) $(am__objects_3)
217
202
libX11_la_OBJECTS = $(am_libX11_la_OBJECTS)
218
203
libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
219
204
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
224
209
am__mv = mv -f
225
210
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
226
211
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
212
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 
213
        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 
214
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 
215
        $(AM_CFLAGS) $(CFLAGS)
227
216
AM_V_CC = $(am__v_CC_$(V))
228
217
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
229
218
am__v_CC_0 = @echo "  CC    " $@;
241
230
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
242
231
am__v_GEN_0 = @echo "  GEN   " $@;
243
232
SOURCES = $(libX11_xcb_la_SOURCES) $(libX11_la_SOURCES)
244
 
DIST_SOURCES = $(am__libX11_xcb_la_SOURCES_DIST) \
245
 
        $(am__libX11_la_SOURCES_DIST)
 
233
DIST_SOURCES = $(libX11_xcb_la_SOURCES) $(am__libX11_la_SOURCES_DIST)
246
234
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
247
235
        html-recursive info-recursive install-data-recursive \
248
236
        install-dvi-recursive install-exec-recursive \
303
291
CCDEPMODE = @CCDEPMODE@
304
292
CC_FOR_BUILD = @CC_FOR_BUILD@
305
293
CFLAGS = @CFLAGS@
 
294
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
306
295
CHANGELOG_CMD = @CHANGELOG_CMD@
307
296
CPP = @CPP@
308
297
CPPFLAGS = @CPPFLAGS@
 
298
CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
309
299
CWARNFLAGS = @CWARNFLAGS@
310
 
CXX = @CXX@
311
 
CXXCPP = @CXXCPP@
312
 
CXXDEPMODE = @CXXDEPMODE@
313
 
CXXFLAGS = @CXXFLAGS@
314
300
CYGPATH_W = @CYGPATH_W@
315
301
DEFS = @DEFS@
316
302
DEPDIR = @DEPDIR@
317
 
DOLT_BASH = @DOLT_BASH@
 
303
DLLTOOL = @DLLTOOL@
318
304
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
319
305
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
320
306
DSYMUTIL = @DSYMUTIL@
321
 
ECHO = @ECHO@
 
307
DUMPBIN = @DUMPBIN@
322
308
ECHO_C = @ECHO_C@
323
309
ECHO_N = @ECHO_N@
324
310
ECHO_T = @ECHO_T@
325
311
EGREP = @EGREP@
326
312
EXEEXT = @EXEEXT@
327
 
F77 = @F77@
328
 
FFLAGS = @FFLAGS@
 
313
FGREP = @FGREP@
329
314
FILE_MAN_DIR = @FILE_MAN_DIR@
330
315
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 
316
FOP = @FOP@
331
317
GREP = @GREP@
332
 
GROFF = @GROFF@
333
318
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
334
319
INSTALL = @INSTALL@
335
320
INSTALL_CMD = @INSTALL_CMD@
341
326
#
342
327
# Building ks_tables.h requires the makekeys utility
343
328
#
344
 
KEYSYMDEF = @KEYSYMDEF@
 
329
KEYSYMDEFS = @KEYSYMDEFS@
345
330
LAUNCHD = @LAUNCHD@
 
331
LD = @LD@
346
332
LDFLAGS = @LDFLAGS@
 
333
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
347
334
LIBOBJS = @LIBOBJS@
348
335
LIBS = @LIBS@
349
336
LIBTOOL = @LIBTOOL@
352
339
LINT = @LINT@
353
340
LINTLIB = @LINTLIB@
354
341
LINT_FLAGS = @LINT_FLAGS@
 
342
LIPO = @LIPO@
355
343
LN_S = @LN_S@
356
 
LTCOMPILE = @LTCOMPILE@
357
 
LTCXXCOMPILE = @LTCXXCOMPILE@
358
344
LTLIBOBJS = @LTLIBOBJS@
359
345
MAINT = @MAINT@
360
346
MAKEINFO = @MAKEINFO@
361
347
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 
348
MANIFEST_TOOL = @MANIFEST_TOOL@
 
349
MAN_SUBSTS = @MAN_SUBSTS@
362
350
MISC_MAN_DIR = @MISC_MAN_DIR@
363
351
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
364
352
MKDIR_P = @MKDIR_P@
 
353
NM = @NM@
365
354
NMEDIT = @NMEDIT@
 
355
OBJDUMP = @OBJDUMP@
366
356
OBJEXT = @OBJEXT@
 
357
OTOOL = @OTOOL@
 
358
OTOOL64 = @OTOOL64@
367
359
PACKAGE = @PACKAGE@
368
360
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
369
361
PACKAGE_NAME = @PACKAGE_NAME@
374
366
PATH_SEPARATOR = @PATH_SEPARATOR@
375
367
PERL = @PERL@
376
368
PKG_CONFIG = @PKG_CONFIG@
377
 
PS2PDF = @PS2PDF@
378
369
RANLIB = @RANLIB@
379
370
RAWCPP = @RAWCPP@
380
371
RAWCPPFLAGS = @RAWCPPFLAGS@
382
373
SET_MAKE = @SET_MAKE@
383
374
SHELL = @SHELL@
384
375
STRIP = @STRIP@
 
376
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
385
377
VERSION = @VERSION@
386
378
WCHAR32 = @WCHAR32@
387
379
X11_CFLAGS = @X11_CFLAGS@
392
384
X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
393
385
X11_LOCALEDIR = @X11_LOCALEDIR@
394
386
X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
395
 
XDMCP_CFLAGS = @XDMCP_CFLAGS@
396
 
XDMCP_LIBS = @XDMCP_LIBS@
397
387
XERRORDB = @XERRORDB@
398
388
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
399
389
XKEYSYMDB = @XKEYSYMDB@
401
391
XLOCALEDIR = @XLOCALEDIR@
402
392
XLOCALELIBDIR = @XLOCALELIBDIR@
403
393
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 
394
XMLTO = @XMLTO@
 
395
XORG_MAN_PAGE = @XORG_MAN_PAGE@
 
396
XORG_SGML_PATH = @XORG_SGML_PATH@
 
397
XSL_STYLESHEET = @XSL_STYLESHEET@
404
398
XTHREADLIB = @XTHREADLIB@
405
399
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
406
400
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
408
402
abs_srcdir = @abs_srcdir@
409
403
abs_top_builddir = @abs_top_builddir@
410
404
abs_top_srcdir = @abs_top_srcdir@
 
405
ac_ct_AR = @ac_ct_AR@
411
406
ac_ct_CC = @ac_ct_CC@
412
 
ac_ct_CXX = @ac_ct_CXX@
413
 
ac_ct_F77 = @ac_ct_F77@
 
407
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
414
408
am__include = @am__include@
415
409
am__leading_dot = @am__leading_dot@
416
410
am__quote = @am__quote@
458
452
top_srcdir = @top_srcdir@
459
453
@XKB_TRUE@XKB_SUBDIRS = xkb
460
454
SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
461
 
lib_LTLIBRARIES = libX11.la $(am__append_5)
 
455
lib_LTLIBRARIES = libX11.la libX11-xcb.la
462
456
BUILT_SOURCES = ks_tables.h
463
 
CLEANFILES = ks_tables.h ks_tables_h $(am__append_7)
 
457
CLEANFILES = ks_tables.h ks_tables_h $(am__append_4)
464
458
AM_CPPFLAGS = \
465
459
        -I$(top_srcdir)/include \
466
460
        -I$(top_srcdir)/include/X11 \
474
468
AM_CFLAGS = \
475
469
        $(X11_CFLAGS) \
476
470
        $(BIGFONT_CFLAGS) \
477
 
        $(XDMCP_CFLAGS) \
478
 
        $(XMALLOC_ZERO_CFLAGS)
 
471
        $(XMALLOC_ZERO_CFLAGS) \
 
472
        $(CWARNFLAGS)
479
473
 
480
474
 
481
475
#
549
543
        TrCoords.c UndefCurs.c UngrabBut.c UngrabKbd.c UngrabKey.c \
550
544
        UngrabPtr.c UngrabSvr.c UninsCmap.c UnldFont.c UnmapSubs.c \
551
545
        UnmapWin.c utlist.h VisUtil.c WarpPtr.c Window.c WinEvent.c \
552
 
        Withdraw.c WMGeom.c WMProps.c WrBitF.c Xatomtype.h Xintatom.h \
553
 
        Xintconn.h XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h \
554
 
        Xresinternal.h Xrm.c XrmI.h $(am__append_1) $(am__append_2) \
555
 
        $(am__append_3) $(am__append_4) $(am__append_6)
 
546
        Withdraw.c WMGeom.c WMProps.c WrBitF.c Xatomtype.h xcb_disp.c \
 
547
        xcb_io.c Xintatom.h Xintconn.h XlibAsync.c XlibInt.c \
 
548
        Xprivate.h XomGeneric.h Xresinternal.h Xrm.c XrmI.h Xxcbint.h \
 
549
        $(am__append_1) $(am__append_2) $(am__append_3)
556
550
x11datadir = @X11_DATADIR@
557
 
x11data_DATA = XKeysymDB XErrorDB
 
551
x11data_DATA = XErrorDB
558
552
EXTRA_DIST = \
559
553
        $(x11data_DATA) \
560
554
        os2Stubs.c \
561
555
        udcInf.c \
562
556
        UIThrStubs.c 
563
557
 
564
 
@XCB_TRUE@libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
565
 
@XCB_TRUE@libX11_xcb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
566
 
@XCB_TRUE@libX11_xcb_la_LIBADD = libX11.la
 
558
libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
 
559
libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
560
libX11_xcb_la_LIBADD = libX11.la
567
561
 
568
562
#
569
563
# Figure out which sub-libraries to link into Xlib
576
570
        $(USE_I18N_LIBS) \
577
571
        $(USE_XCMS_LIBS) \
578
572
        $(USE_XKB_LIBS) \
579
 
        $(X11_LIBS) \
580
 
        $(XDMCP_LIBS)
 
573
        $(X11_LIBS)
581
574
 
582
575
 
583
576
# Check source code with tools like lint & sparse
671
664
          rm -f "$${dir}/so_locations"; \
672
665
        done
673
666
libX11-xcb.la: $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_DEPENDENCIES) 
674
 
        $(AM_V_CCLD)$(libX11_xcb_la_LINK) $(am_libX11_xcb_la_rpath) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS)
 
667
        $(AM_V_CCLD)$(libX11_xcb_la_LINK) -rpath $(libdir) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS)
675
668
libX11.la: $(libX11_la_OBJECTS) $(libX11_la_DEPENDENCIES) 
676
669
        $(AM_V_CCLD)$(libX11_la_LINK) -rpath $(libdir) $(libX11_la_OBJECTS) $(libX11_la_LIBADD) $(LIBS)
677
670
 
712
705
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clear.Plo@am__quote@
713
706
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClearArea.Plo@am__quote@
714
707
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfWind.Plo@am__quote@
715
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConnDis.Plo@am__quote@
716
708
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Context.Plo@am__quote@
717
709
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvSel.Plo@am__quote@
718
710
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyArea.Plo@am__quote@
942
934
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locking.Plo@am__quote@
943
935
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os2Stubs.Plo@am__quote@
944
936
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udcInf.Plo@am__quote@
945
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_trans.Plo@am__quote@
946
937
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_xcb.Plo@am__quote@
947
938
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_disp.Plo@am__quote@
948
939
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_io.Plo@am__quote@
1358
1349
@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libX11_la_SOURCES)
1359
1350
@MAKE_LINT_LIB_TRUE@    $(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
1360
1351
 
1361
 
ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
1362
 
        $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
 
1352
ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
 
1353
        $(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
1363
1354
        mv ks_tables_h $@
1364
1355
 
1365
1356
$(top_builddir)/src/util/makekeys$(EXEEXT): force