← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/xf8_16bpp/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:
hw/xfree86/xf8_16bpp/Makefile.in
83
83
libxf8_16bpp_la_LIBADD =
84
84
am_libxf8_16bpp_la_OBJECTS = xf8_16module.lo
85
85
libxf8_16bpp_la_OBJECTS = $(am_libxf8_16bpp_la_OBJECTS)
86
 
AM_V_lt = $(am__v_lt_$(V))
87
 
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
88
 
am__v_lt_0 = --silent
89
 
libxf8_16bpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
90
 
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
91
 
        $(AM_CFLAGS) $(CFLAGS) $(libxf8_16bpp_la_LDFLAGS) $(LDFLAGS) \
92
 
        -o $@
 
86
libxf8_16bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 
87
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 
88
        $(libxf8_16bpp_la_LDFLAGS) $(LDFLAGS) -o $@
93
89
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
94
90
depcomp = $(SHELL) $(top_srcdir)/depcomp
95
91
am__depfiles_maybe = depfiles
96
92
am__mv = mv -f
97
93
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
98
94
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
99
 
AM_V_CC = $(am__v_CC_$(V))
100
 
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
101
 
am__v_CC_0 = @echo "  CC    " $@;
102
 
AM_V_at = $(am__v_at_$(V))
103
 
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
104
 
am__v_at_0 = @
105
95
CCLD = $(CC)
106
 
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
107
 
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
108
 
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
109
 
AM_V_CCLD = $(am__v_CCLD_$(V))
110
 
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
111
 
am__v_CCLD_0 = @echo "  CCLD  " $@;
112
 
AM_V_GEN = $(am__v_GEN_$(V))
113
 
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
114
 
am__v_GEN_0 = @echo "  GEN   " $@;
 
96
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 
97
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 
98
        $(LDFLAGS) -o $@
115
99
SOURCES = $(libxf8_16bpp_la_SOURCES)
116
100
DIST_SOURCES = $(libxf8_16bpp_la_SOURCES)
117
101
HEADERS = $(sdk_HEADERS)
123
107
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
124
108
ALLOCA = @ALLOCA@
125
109
AMTAR = @AMTAR@
126
 
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
127
110
AM_MAKEFLAGS = @AM_MAKEFLAGS@
128
111
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
129
112
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
277
260
RAWCPP = @RAWCPP@
278
261
RAWCPPFLAGS = @RAWCPPFLAGS@
279
262
SED = @SED@
 
263
SELINUX_CFLAGS = @SELINUX_CFLAGS@
 
264
SELINUX_LIBS = @SELINUX_LIBS@
280
265
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
281
266
SET_MAKE = @SET_MAKE@
282
267
SHELL = @SHELL@
483
468
          rm -f "$${dir}/so_locations"; \
484
469
        done
485
470
libxf8_16bpp.la: $(libxf8_16bpp_la_OBJECTS) $(libxf8_16bpp_la_DEPENDENCIES) 
486
 
        $(AM_V_CCLD)$(libxf8_16bpp_la_LINK) -rpath $(moduledir) $(libxf8_16bpp_la_OBJECTS) $(libxf8_16bpp_la_LIBADD) $(LIBS)
 
471
        $(libxf8_16bpp_la_LINK) -rpath $(moduledir) $(libxf8_16bpp_la_OBJECTS) $(libxf8_16bpp_la_LIBADD) $(LIBS)
487
472
 
488
473
mostlyclean-compile:
489
474
        -rm -f *.$(OBJEXT)
494
479
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf8_16module.Plo@am__quote@
495
480
 
496
481
.c.o:
497
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
498
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
499
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
482
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
483
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
500
484
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
501
485
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
502
486
@am__fastdepCC_FALSE@   $(COMPILE) -c $<
503
487
 
504
488
.c.obj:
505
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
506
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
507
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
489
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 
490
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
508
491
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
509
492
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
510
493
@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
511
494
 
512
495
.c.lo:
513
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
514
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
515
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
496
@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
497
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
516
498
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
517
499
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
518
500
@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<