diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-09 20:27:49 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-01-18 15:10:17 -0800 |
| commit | b8492e18a7e5322c4a492f6cf6cfeb5b0221d994 (patch) | |
| tree | 731185f66ed7dd1766a3378b59154993c7596acf /hw/xnest | |
| parent | 57ca20d26614a0787cdd0db91a2eb8cdb301f2dc (diff) | |
Xnest: build Xnest man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xnest')
| -rw-r--r-- | hw/xnest/.gitignore | 2 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 26 | ||||
| -rw-r--r-- | hw/xnest/man/Makefile.am | 10 | ||||
| -rw-r--r-- | hw/xnest/man/Xnest.man (renamed from hw/xnest/Xnest.man.pre) | 0 |
4 files changed, 13 insertions, 25 deletions
diff --git a/hw/xnest/.gitignore b/hw/xnest/.gitignore index 16db15e20..b76c5a2d0 100644 --- a/hw/xnest/.gitignore +++ b/hw/xnest/.gitignore @@ -1,3 +1 @@ -# Add & Override for this directory and it's subdirectories Xnest -Xnest.man diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 666a0f0e6..c395b4dae 100644 --- a/hw/xnest/Makefile.am +++ b/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/hw/xnest/man/Makefile.am b/hw/xnest/man/Makefile.am new file mode 100644 index 000000000..ff3468f59 --- /dev/null +++ b/hw/xnest/man/Makefile.am @@ -0,0 +1,10 @@ +appmandir = $(APP_MAN_DIR) +appman_PRE = Xnest.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/man/Xnest.man index 024d88e82..024d88e82 100644 --- a/hw/xnest/Xnest.man.pre +++ b/hw/xnest/man/Xnest.man |