diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
| commit | 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch) | |
| tree | 7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/Xext/Makefile.in | |
| parent | 8def4a30414ae76e228f285ccab8bba6de083d08 (diff) | |
| download | vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2 vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip | |
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/Xext/Makefile.in')
| -rw-r--r-- | xorg-server/Xext/Makefile.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xorg-server/Xext/Makefile.in b/xorg-server/Xext/Makefile.in index 4293b8f98..0f419fd9e 100644 --- a/xorg-server/Xext/Makefile.in +++ b/xorg-server/Xext/Makefile.in @@ -81,10 +81,11 @@ am__libXext_la_SOURCES_DIST = bigreq.c geext.c shape.c sleepuntil.c \ sleepuntil.h sync.c syncsrv.h xcmisc.c xtest.c shm.c shmint.h \ panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h \ panoramiXprocs.c panoramiXSwap.c xace.c xace.h xacestr.h \ - security.c securitysrv.h xcalibrate.c xf86bigfont.c xvmain.c \ - xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h xres.c saver.c \ - xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h \ - xselinuxint.h mbuf.c dpms.c dpmsproc.h + security.c securitysrv.h xcalibrate.c xf86bigfont.c \ + xf86bigfontsrv.h xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h \ + xvdisp.h xres.c saver.c xselinux_ext.c xselinux_hooks.c \ + xselinux_label.c xselinux.h xselinuxint.h mbuf.c dpms.c \ + dpmsproc.h am__objects_1 = shm.lo @MITSHM_TRUE@am__objects_2 = $(am__objects_1) am__objects_3 = panoramiX.lo panoramiXprocs.lo panoramiXSwap.lo @@ -127,7 +128,8 @@ am__libXextbuiltin_la_SOURCES_DIST = bigreq.c geext.c shape.c \ sleepuntil.c sleepuntil.h sync.c syncsrv.h xcmisc.c xtest.c \ shm.c shmint.h panoramiX.c panoramiX.h panoramiXh.h \ panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c xace.c xace.h \ - xacestr.h security.c securitysrv.h xcalibrate.c xf86bigfont.c + xacestr.h security.c securitysrv.h xcalibrate.c xf86bigfont.c \ + xf86bigfontsrv.h @XORG_TRUE@am_libXextbuiltin_la_OBJECTS = $(am__objects_13) libXextbuiltin_la_OBJECTS = $(am_libXextbuiltin_la_OBJECTS) @XORG_TRUE@am_libXextbuiltin_la_rpath = @@ -205,6 +207,7 @@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ +ARM_BACKTRACE_CFLAGS = @ARM_BACKTRACE_CFLAGS@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -392,6 +395,7 @@ XDMX_SYS_LIBS = @XDMX_SYS_LIBS@ XEPHYR_CFLAGS = @XEPHYR_CFLAGS@ XEPHYR_INCS = @XEPHYR_INCS@ XEPHYR_LIBS = @XEPHYR_LIBS@ +XF86CONFIGDIR = @XF86CONFIGDIR@ XF86CONFIGFILE = @XF86CONFIGFILE@ XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@ XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@ @@ -559,7 +563,7 @@ MULTIBUFFER_SRCS = mbuf.c EXTRA_MULTIBUFFER_SRCS = mbufbf.c mbufpx.c # XF86 Big Font extension -BIGFONT_SRCS = xf86bigfont.c +BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h # DPMS extension DPMS_SRCS = dpms.c dpmsproc.h |