← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xorg-server/maverick

« back to all changes in this revision

Viewing changes to config/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Makefile.in
70
70
am_libconfig_la_OBJECTS = config.lo $(am__objects_1) $(am__objects_2) \
71
71
        $(am__objects_3)
72
72
libconfig_la_OBJECTS = $(am_libconfig_la_OBJECTS)
73
 
AM_V_lt = $(am__v_lt_$(V))
74
 
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
75
 
am__v_lt_0 = --silent
76
73
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
77
74
depcomp = $(SHELL) $(top_srcdir)/depcomp
78
75
am__depfiles_maybe = depfiles
79
76
am__mv = mv -f
80
77
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
81
78
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
82
 
AM_V_CC = $(am__v_CC_$(V))
83
 
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
84
 
am__v_CC_0 = @echo "  CC    " $@;
85
 
AM_V_at = $(am__v_at_$(V))
86
 
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
87
 
am__v_at_0 = @
88
79
CCLD = $(CC)
89
 
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
90
 
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
91
 
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
92
 
AM_V_CCLD = $(am__v_CCLD_$(V))
93
 
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
94
 
am__v_CCLD_0 = @echo "  CCLD  " $@;
95
 
AM_V_GEN = $(am__v_GEN_$(V))
96
 
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
97
 
am__v_GEN_0 = @echo "  GEN   " $@;
 
80
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 
81
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 
82
        $(LDFLAGS) -o $@
98
83
SOURCES = $(libconfig_la_SOURCES)
99
84
DIST_SOURCES = $(am__libconfig_la_SOURCES_DIST)
100
85
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
128
113
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
129
114
ALLOCA = @ALLOCA@
130
115
AMTAR = @AMTAR@
131
 
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
132
116
AM_MAKEFLAGS = @AM_MAKEFLAGS@
133
117
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
134
118
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
282
266
RAWCPP = @RAWCPP@
283
267
RAWCPPFLAGS = @RAWCPPFLAGS@
284
268
SED = @SED@
 
269
SELINUX_CFLAGS = @SELINUX_CFLAGS@
 
270
SELINUX_LIBS = @SELINUX_LIBS@
285
271
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
286
272
SET_MAKE = @SET_MAKE@
287
273
SHELL = @SHELL@
467
453
          rm -f "$${dir}/so_locations"; \
468
454
        done
469
455
libconfig.la: $(libconfig_la_OBJECTS) $(libconfig_la_DEPENDENCIES) 
470
 
        $(AM_V_CCLD)$(LINK)  $(libconfig_la_OBJECTS) $(libconfig_la_LIBADD) $(LIBS)
 
456
        $(LINK)  $(libconfig_la_OBJECTS) $(libconfig_la_LIBADD) $(LIBS)
471
457
 
472
458
mostlyclean-compile:
473
459
        -rm -f *.$(OBJEXT)
481
467
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hal.Plo@am__quote@
482
468
 
483
469
.c.o:
484
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
485
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
486
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
470
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
471
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
487
472
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
488
473
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
489
474
@am__fastdepCC_FALSE@   $(COMPILE) -c $<
490
475
 
491
476
.c.obj:
492
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
493
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
494
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
477
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 
478
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
495
479
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
496
480
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
497
481
@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
498
482
 
499
483
.c.lo:
500
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
501
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
502
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
484
@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
485
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
503
486
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
504
487
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
505
488
@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<