← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xorg-server/quantal-proposed

« back to all changes in this revision

Viewing changes to glx/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers, Maarten Lankhorst, Christopher James Halse Rogers
  • Date: 2012-07-25 16:54:16 UTC
  • mfrom: (0.10.25)
  • Revision ID: package-import@ubuntu.com-20120725165416-5y3qcty2qdzgehgd
Tags: 2:1.12.99.902-0ubuntu1
https://launchpad.net/bugs/1015292
[ Maarten Lankhorst ]
* New upstream release snapshot (on the way to 1.13).
  - Fixes QT5 app segfaults (LP: #1015292)
* Bump minimum required abi, randr, dri2 and gl protos.
* Refreshed patches to apply on x1.13
* Remove patches merged upstream:
  - 508_device_off_release_buttons.patch
  - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
  - 511-dix-move-freeing-the-sprite-into-a-function.patch
  - 512-dix-free-the-sprite-when-disabling-the-device.patch
  - 513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
  - 514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
  - 515-dix-disable-all-devices-before-shutdown.patch

[ Christopher James Halse Rogers ]
* debian/patches/100_rethrow_signals.patch:
  - Drop, in favour of getting LightDM to pass -core to the server. This
    upstream mechanism is significantly more reliable at dumping core in
    my testing. We may later wish to improve this with some processing in
    the apport hook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glx/Makefile.in
1
 
# Makefile.in generated by automake 1.12 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11.5 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
55
55
@DRI_TRUE@am__append_2 = glxdri.c
56
56
@DRI2_AIGLX_TRUE@am__append_3 = glxdri2.c
57
57
subdir = glx
58
 
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
59
 
        $(top_srcdir)/depcomp
 
58
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
60
59
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
61
60
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
62
 
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
63
 
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
64
 
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
65
 
        $(top_srcdir)/configure.ac
 
61
        $(top_srcdir)/m4/xorg-tls.m4 $(top_srcdir)/configure.ac
66
62
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
67
63
        $(ACLOCAL_M4)
68
64
mkinstalldirs = $(install_sh) -d
112
108
        $(AM_CFLAGS) $(CFLAGS)
113
109
AM_V_CC = $(am__v_CC_@AM_V@)
114
110
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
115
 
am__v_CC_0 = @echo "  CC      " $@;
 
111
am__v_CC_0 = @echo "  CC    " $@;
116
112
AM_V_at = $(am__v_at_@AM_V@)
117
113
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
118
114
am__v_at_0 = @
122
118
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
123
119
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
124
120
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
125
 
am__v_CCLD_0 = @echo "  CCLD    " $@;
 
121
am__v_CCLD_0 = @echo "  CCLD  " $@;
126
122
AM_V_GEN = $(am__v_GEN_@AM_V@)
127
123
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
128
 
am__v_GEN_0 = @echo "  GEN     " $@;
 
124
am__v_GEN_0 = @echo "  GEN   " $@;
129
125
SOURCES = $(libglx_la_SOURCES) $(libglxdri_la_SOURCES)
130
126
DIST_SOURCES = $(libglx_la_SOURCES) $(am__libglxdri_la_SOURCES_DIST)
131
127
am__can_run_installinfo = \
193
189
DOXYGEN = @DOXYGEN@
194
190
DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
195
191
DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
196
 
DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
197
 
DRIPROTO_LIBS = @DRIPROTO_LIBS@
198
192
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
199
193
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
200
 
DRI_CFLAGS = @DRI_CFLAGS@
201
194
DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
202
 
DRI_LIBS = @DRI_LIBS@
203
195
DSYMUTIL = @DSYMUTIL@
204
196
DTRACE = @DTRACE@
205
197
DUMPBIN = @DUMPBIN@
221
213
FOP = @FOP@
222
214
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
223
215
GLX_DEFINES = @GLX_DEFINES@
 
216
GLX_SYS_LIBS = @GLX_SYS_LIBS@
224
217
GLX_TLS = @GLX_TLS@
225
218
GL_CFLAGS = @GL_CFLAGS@
226
219
GL_LIBS = @GL_LIBS@
245
238
LD = @LD@
246
239
LDFLAGS = @LDFLAGS@
247
240
LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
 
241
LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@
248
242
LEX = @LEX@
249
243
LEXLIB = @LEXLIB@
250
244
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
361
355
XNEST_LIBS = @XNEST_LIBS@
362
356
XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
363
357
XORG_CFLAGS = @XORG_CFLAGS@
 
358
XORG_DRIVER_LIBS = @XORG_DRIVER_LIBS@
364
359
XORG_INCS = @XORG_INCS@
365
360
XORG_LIBS = @XORG_LIBS@
366
361
XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
465
460
AM_CFLAGS = \
466
461
        @DIX_CFLAGS@ \
467
462
        @GL_CFLAGS@ \
468
 
        @DRI_CFLAGS@ \
469
463
        @XLIB_CFLAGS@ \
470
464
        @LIBDRM_CFLAGS@ \
471
 
        @DRIPROTO_CFLAGS@ \
472
465
        @GLX_DEFINES@ \
473
466
        @GLX_ARCH_DEFINES@
474
467
 
580
573
 
581
574
clean-noinstLTLIBRARIES:
582
575
        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
583
 
        @list='$(noinst_LTLIBRARIES)'; \
584
 
        locs=`for p in $$list; do echo $$p; done | \
585
 
              sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
586
 
              sort -u`; \
587
 
        test -z "$$locs" || { \
588
 
          echo rm -f $${locs}; \
589
 
          rm -f $${locs}; \
590
 
        }
 
576
        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 
577
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 
578
          test "$$dir" != "$$p" || dir=.; \
 
579
          echo "rm -f \"$${dir}/so_locations\""; \
 
580
          rm -f "$${dir}/so_locations"; \
 
581
        done
591
582
libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) $(EXTRA_libglx_la_DEPENDENCIES) 
592
583
        $(AM_V_CCLD)$(LINK)  $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS)
593
584
libglxdri.la: $(libglxdri_la_OBJECTS) $(libglxdri_la_DEPENDENCIES) $(EXTRA_libglxdri_la_DEPENDENCIES) 
710
701
          && $(am__cd) $(top_srcdir) \
711
702
          && gtags -i $(GTAGS_ARGS) "$$here"
712
703
 
713
 
cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
714
 
        list='$(SOURCES) $(HEADERS) $(LISP)'; \
715
 
        case "$(srcdir)" in \
716
 
          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
717
 
          *) sdir=$(subdir)/$(srcdir) ;; \
718
 
        esac; \
719
 
        for i in $$list; do \
720
 
          if test -f "$$i"; then \
721
 
            echo "$(subdir)/$$i"; \
722
 
          else \
723
 
            echo "$$sdir/$$i"; \
724
 
          fi; \
725
 
        done >> $(top_builddir)/cscope.files
726
 
 
727
704
distclean-tags:
728
705
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
729
706
 
865
842
.MAKE: install-am install-strip
866
843
 
867
844
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
868
 
        clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \
869
 
        distclean distclean-compile distclean-generic \
870
 
        distclean-libtool distclean-tags distdir dvi dvi-am html \
871
 
        html-am info info-am install install-am install-data \
872
 
        install-data-am install-dvi install-dvi-am install-exec \
873
 
        install-exec-am install-html install-html-am install-info \
874
 
        install-info-am install-man install-pdf install-pdf-am \
875
 
        install-ps install-ps-am install-strip installcheck \
876
 
        installcheck-am installdirs maintainer-clean \
877
 
        maintainer-clean-generic mostlyclean mostlyclean-compile \
878
 
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
879
 
        tags uninstall uninstall-am
 
845
        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 
846
        distclean-compile distclean-generic distclean-libtool \
 
847
        distclean-tags distdir dvi dvi-am html html-am info info-am \
 
848
        install install-am install-data install-data-am install-dvi \
 
849
        install-dvi-am install-exec install-exec-am install-html \
 
850
        install-html-am install-info install-info-am install-man \
 
851
        install-pdf install-pdf-am install-ps install-ps-am \
 
852
        install-strip installcheck installcheck-am installdirs \
 
853
        maintainer-clean maintainer-clean-generic mostlyclean \
 
854
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 
855
        pdf pdf-am ps ps-am tags uninstall uninstall-am
880
856
 
881
857
 
882
858
# Tell versions [3.59,3.63) of GNU make to not export all variables.