← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid-updates

« back to all changes in this revision

Viewing changes to hw/xquartz/GL/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/xquartz/GL/Makefile.in
60
60
am_libCGLCore_la_OBJECTS = indirect.lo capabilities.lo \
61
61
        visualConfigs.lo
62
62
libCGLCore_la_OBJECTS = $(am_libCGLCore_la_OBJECTS)
63
 
AM_V_lt = $(am__v_lt_$(V))
64
 
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
65
 
am__v_lt_0 = --silent
66
63
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
67
64
depcomp = $(SHELL) $(top_srcdir)/depcomp
68
65
am__depfiles_maybe = depfiles
69
66
am__mv = mv -f
70
67
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
71
68
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
72
 
AM_V_CC = $(am__v_CC_$(V))
73
 
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
74
 
am__v_CC_0 = @echo "  CC    " $@;
75
 
AM_V_at = $(am__v_at_$(V))
76
 
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
77
 
am__v_at_0 = @
78
69
CCLD = $(CC)
79
 
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
80
 
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
81
 
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
82
 
AM_V_CCLD = $(am__v_CCLD_$(V))
83
 
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
84
 
am__v_CCLD_0 = @echo "  CCLD  " $@;
85
 
AM_V_GEN = $(am__v_GEN_$(V))
86
 
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
87
 
am__v_GEN_0 = @echo "  GEN   " $@;
 
70
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 
71
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 
72
        $(LDFLAGS) -o $@
88
73
SOURCES = $(libCGLCore_la_SOURCES)
89
74
DIST_SOURCES = $(libCGLCore_la_SOURCES)
90
75
ETAGS = etags
95
80
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
96
81
ALLOCA = @ALLOCA@
97
82
AMTAR = @AMTAR@
98
 
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
99
83
AM_MAKEFLAGS = @AM_MAKEFLAGS@
100
84
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
101
85
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
249
233
RAWCPP = @RAWCPP@
250
234
RAWCPPFLAGS = @RAWCPPFLAGS@
251
235
SED = @SED@
 
236
SELINUX_CFLAGS = @SELINUX_CFLAGS@
 
237
SELINUX_LIBS = @SELINUX_LIBS@
252
238
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
253
239
SET_MAKE = @SET_MAKE@
254
240
SHELL = @SHELL@
445
431
          rm -f "$${dir}/so_locations"; \
446
432
        done
447
433
libCGLCore.la: $(libCGLCore_la_OBJECTS) $(libCGLCore_la_DEPENDENCIES) 
448
 
        $(AM_V_CCLD)$(LINK)  $(libCGLCore_la_OBJECTS) $(libCGLCore_la_LIBADD) $(LIBS)
 
434
        $(LINK)  $(libCGLCore_la_OBJECTS) $(libCGLCore_la_LIBADD) $(LIBS)
449
435
 
450
436
mostlyclean-compile:
451
437
        -rm -f *.$(OBJEXT)
458
444
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visualConfigs.Plo@am__quote@
459
445
 
460
446
.c.o:
461
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
462
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
463
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
447
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
448
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
464
449
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
465
450
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
466
451
@am__fastdepCC_FALSE@   $(COMPILE) -c $<
467
452
 
468
453
.c.obj:
469
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
470
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
471
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
454
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 
455
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
472
456
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
473
457
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
474
458
@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
475
459
 
476
460
.c.lo:
477
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
478
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
479
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
461
@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
462
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
480
463
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
481
464
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
482
465
@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<