diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
| commit | cdc60fdcddbe5666aac11af34c6c030d4a670b99 (patch) | |
| tree | 4ec58bc0728308be9921485d5e79979bbc65a9b1 /xorg-server/hw/xnest | |
| parent | 800da6ed70c65f5059726b7ce35030e9c7235f01 (diff) | |
| parent | a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (diff) | |
| download | vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.gz vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.bz2 vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest')
| -rw-r--r-- | xorg-server/hw/xnest/Makefile.am | 26 | ||||
| -rw-r--r-- | xorg-server/hw/xnest/man/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xnest/man/Xnest.man (renamed from xorg-server/hw/xnest/Xnest.man.pre) | 0 |
3 files changed, 5 insertions, 23 deletions
diff --git a/xorg-server/hw/xnest/Makefile.am b/xorg-server/hw/xnest/Makefile.am index 666a0f0e6..c395b4dae 100644 --- a/xorg-server/hw/xnest/Makefile.am +++ b/xorg-server/hw/xnest/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = man + bin_PROGRAMS = Xnest noinst_LIBRARIES = libfbcmap.a @@ -59,34 +61,12 @@ Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS) Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) EXTRA_DIST = icon \ - screensaver \ - Xnest.man.pre + screensaver # -UDPMSExtension for miinitext? can't put into # OS_DEFINES??? # EXT_DEFINES??? # ICONFIGFILES -- SpecialCObjectRule -# Man page -include $(top_srcdir)/cpprules.in - -appmandir = $(APP_MAN_DIR) - -appman_PRE = Xnest.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRAMANDEFS = \ - -D__XCONFIGFILE__=$(__XCONFIGFILE__) \ - -D__XSERVERNAME__=$(XSERVERNAME) - -BUILT_SOURCES = $(appman_PRE) -CLEANFILES = $(appman_PRE) $(appman_DATA) - -SUFFIXES += .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - -$(AM_V_at)rm -f $@ - $(AM_V_at)$(LN_S) $< $@ - relink: $(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT) diff --git a/xorg-server/hw/xnest/man/Makefile.am b/xorg-server/hw/xnest/man/Makefile.am new file mode 100644 index 000000000..30b6370bc --- /dev/null +++ b/xorg-server/hw/xnest/man/Makefile.am @@ -0,0 +1,2 @@ +include $(top_srcdir)/manpages.am +appman_PRE = Xnest.man diff --git a/xorg-server/hw/xnest/Xnest.man.pre b/xorg-server/hw/xnest/man/Xnest.man index 024d88e82..024d88e82 100644 --- a/xorg-server/hw/xnest/Xnest.man.pre +++ b/xorg-server/hw/xnest/man/Xnest.man |