← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/common/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/common/Makefile.in
83
83
nodist_libcommon_la_OBJECTS = xf86DefModeSet.lo
84
84
libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) \
85
85
        $(nodist_libcommon_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
86
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
90
87
depcomp = $(SHELL) $(top_srcdir)/depcomp
91
88
am__depfiles_maybe = depfiles
92
89
am__mv = mv -f
93
90
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
94
91
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
95
 
AM_V_CC = $(am__v_CC_$(V))
96
 
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
97
 
am__v_CC_0 = @echo "  CC    " $@;
98
 
AM_V_at = $(am__v_at_$(V))
99
 
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
100
 
am__v_at_0 = @
101
92
CCLD = $(CC)
102
 
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
103
 
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
104
 
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
105
 
AM_V_CCLD = $(am__v_CCLD_$(V))
106
 
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
107
 
am__v_CCLD_0 = @echo "  CCLD  " $@;
108
 
AM_V_GEN = $(am__v_GEN_$(V))
109
 
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
110
 
am__v_GEN_0 = @echo "  GEN   " $@;
 
93
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 
94
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 
95
        $(LDFLAGS) -o $@
111
96
SOURCES = $(libcommon_la_SOURCES) $(nodist_libcommon_la_SOURCES)
112
97
DIST_SOURCES = $(am__libcommon_la_SOURCES_DIST)
113
98
am__sdk_HEADERS_DIST = compiler.h fourcc.h xf86.h xf86Module.h \
146
131
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
147
132
ALLOCA = @ALLOCA@
148
133
AMTAR = @AMTAR@
149
 
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
150
134
AM_MAKEFLAGS = @AM_MAKEFLAGS@
151
135
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
152
136
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
300
284
RAWCPP = @RAWCPP@
301
285
RAWCPPFLAGS = @RAWCPPFLAGS@
302
286
SED = @SED@
 
287
SELINUX_CFLAGS = @SELINUX_CFLAGS@
 
288
SELINUX_LIBS = @SELINUX_LIBS@
303
289
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
304
290
SET_MAKE = @SET_MAKE@
305
291
SHELL = @SHELL@
549
535
          rm -f "$${dir}/so_locations"; \
550
536
        done
551
537
libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) 
552
 
        $(AM_V_CCLD)$(LINK)  $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
 
538
        $(LINK)  $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
553
539
 
554
540
mostlyclean-compile:
555
541
        -rm -f *.$(OBJEXT)
589
575
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xorgHelper.Plo@am__quote@
590
576
 
591
577
.c.o:
592
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
593
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
594
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
578
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
579
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
595
580
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
596
581
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
597
582
@am__fastdepCC_FALSE@   $(COMPILE) -c $<
598
583
 
599
584
.c.obj:
600
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
601
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
602
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
585
@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 
586
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
603
587
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
604
588
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
605
589
@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
606
590
 
607
591
.c.lo:
608
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
609
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
610
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
 
592
@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 
593
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
611
594
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
612
595
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
613
596
@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<