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/hw/kdrive/fake | |
| 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/hw/kdrive/fake')
| -rw-r--r-- | xorg-server/hw/kdrive/fake/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/fake/Makefile.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/fake/Makefile.am b/xorg-server/hw/kdrive/fake/Makefile.am index be0fa42a2..6d3ed056e 100644 --- a/xorg-server/hw/kdrive/fake/Makefile.am +++ b/xorg-server/hw/kdrive/fake/Makefile.am @@ -27,4 +27,4 @@ Xfake_DEPENDENCIES = \ @KDRIVE_LOCAL_LIBS@ relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) + $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) diff --git a/xorg-server/hw/kdrive/fake/Makefile.in b/xorg-server/hw/kdrive/fake/Makefile.in index 5e59a8277..079ff977f 100644 --- a/xorg-server/hw/kdrive/fake/Makefile.in +++ b/xorg-server/hw/kdrive/fake/Makefile.in @@ -109,6 +109,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@ @@ -296,6 +297,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@ @@ -764,7 +766,7 @@ uninstall-am: uninstall-binPROGRAMS relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) + $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |