diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/hw/xfree86/Makefile.in | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/Makefile.in')
| -rw-r--r-- | xorg-server/hw/xfree86/Makefile.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in index 3bc1b00ed..95d94357c 100644 --- a/xorg-server/hw/xfree86/Makefile.in +++ b/xorg-server/hw/xfree86/Makefile.in @@ -193,6 +193,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -223,6 +224,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -233,6 +241,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -282,6 +291,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -306,6 +317,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = sed SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -396,7 +409,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -989,7 +1001,8 @@ libxorg.c xorg.c: touch $@ @SOLARIS_ASM_INLINE_TRUE@os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il: -@SOLARIS_ASM_INLINE_TRUE@ cd os-support/solaris ; make solaris-@SOLARIS_INOUT_ARCH@.il +@SOLARIS_ASM_INLINE_TRUE@ cd os-support/solaris ; \ +@SOLARIS_ASM_INLINE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) solaris-@SOLARIS_INOUT_ARCH@.il # do not use $(mkdir_p) if you want automake 1.7 to work install-data-local: |