diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 12:30:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 12:30:48 +0000 |
| commit | 1d59691fe77c20ecb010ea8589a940c4ea6ac356 (patch) | |
| tree | d1ee8df3981303c35e46905c9df26203bb232973 /xorg-server/hw/xnest | |
| parent | 0be07f8b067afad77df8cac086b43f6d213fbe20 (diff) | |
| download | vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.gz vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.bz2 vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.zip | |
Updated to following packages:
pixman-0.18.0
xorg-server-1.8.0
Diffstat (limited to 'xorg-server/hw/xnest')
| -rw-r--r-- | xorg-server/hw/xnest/Makefile.am | 6 | ||||
| -rw-r--r-- | xorg-server/hw/xnest/Makefile.in | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/xorg-server/hw/xnest/Makefile.am b/xorg-server/hw/xnest/Makefile.am index f95aab140..666a0f0e6 100644 --- a/xorg-server/hw/xnest/Makefile.am +++ b/xorg-server/hw/xnest/Makefile.am @@ -85,8 +85,8 @@ CLEANFILES = $(appman_PRE) $(appman_DATA) SUFFIXES += .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - -rm -f $@ - $(LN_S) $< $@ + -$(AM_V_at)rm -f $@ + $(AM_V_at)$(LN_S) $< $@ relink: - rm -f Xnest && $(MAKE) Xnest + $(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT) diff --git a/xorg-server/hw/xnest/Makefile.in b/xorg-server/hw/xnest/Makefile.in index 508ed1685..15e6cd7b5 100644 --- a/xorg-server/hw/xnest/Makefile.in +++ b/xorg-server/hw/xnest/Makefile.in @@ -150,6 +150,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@ @@ -305,7 +306,7 @@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ -SED = sed +SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ @@ -337,6 +338,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@ @@ -1000,11 +1002,11 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): - -rm -f $@ - $(LN_S) $< $@ + -$(AM_V_at)rm -f $@ + $(AM_V_at)$(LN_S) $< $@ relink: - rm -f Xnest && $(MAKE) Xnest + $(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT) # 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. |