summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--Xprint/doc/Makefile.am8
-rw-r--r--doc/Makefile.am8
-rw-r--r--hw/dmx/Makefile.am6
-rw-r--r--hw/dmx/config/Makefile.am6
-rw-r--r--hw/vfb/Makefile.am8
-rw-r--r--hw/xfree86/getconfig/Makefile.am8
-rw-r--r--hw/xfree86/utils/gtf/Makefile.am8
-rw-r--r--hw/xfree86/utils/kbd_mode/Makefile.am8
-rw-r--r--hw/xfree86/utils/pcitweak/Makefile.am8
-rw-r--r--hw/xfree86/utils/scanpci/Makefile.am8
-rw-r--r--hw/xfree86/utils/xorgcfg/Makefile.am8
-rw-r--r--hw/xfree86/utils/xorgconfig/Makefile.am8
-rw-r--r--hw/xnest/Makefile.am8
14 files changed, 67 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index d00e8efbe..8cca2d4b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * Xprint/doc/Makefile.am:
+ * doc/Makefile.am:
+ * hw/dmx/Makefile.am:
+ * hw/dmx/config/Makefile.am:
+ * hw/vfb/Makefile.am:
+ * hw/xfree86/getconfig/Makefile.am:
+ * hw/xfree86/utils/gtf/Makefile.am:
+ * hw/xfree86/utils/kbd_mode/Makefile.am:
+ * hw/xfree86/utils/pcitweak/Makefile.am:
+ * hw/xfree86/utils/scanpci/Makefile.am:
+ * hw/xfree86/utils/xorgcfg/Makefile.am:
+ * hw/xfree86/utils/xorgconfig/Makefile.am:
+ * hw/xnest/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-06 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/Xprint/doc/Makefile.am b/Xprint/doc/Makefile.am
index e26d0ee98..c0cb9d3d9 100644
--- a/Xprint/doc/Makefile.am
+++ b/Xprint/doc/Makefile.am
@@ -2,13 +2,13 @@ MAN_SRCS = Xprt.man.pre
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = Xprt.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = Xprt.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ff64992dc..0ac533e18 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,11 @@
appmandir = $(APP_MAN_DIR)
# Xserver.man covers options generic to all X servers built in this tree
-appman_SOURCES = Xserver.man.pre
+appman_PRE = Xserver.man.pre
-appman_PROCESSED = $(appman_SOURCES:man.pre=man)
+appman_PROCESSED = $(appman_PRE:man.pre=man)
-appman_DATA = $(appman_SOURCES:man.pre=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
BUILT_SOURCES = $(appman_PROCESSED)
@@ -22,4 +22,4 @@ EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -
DEVEL_DOCS = smartsched
-EXTRA_DIST = $(DEVEL_DOCS) $(appman_SOURCES)
+EXTRA_DIST = $(DEVEL_DOCS) $(appman_PRE)
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 23263f6fb..7cb852154 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -87,8 +87,8 @@ Xdmx_CFLAGS = @SERVER_DEFINES@ \
# Man page
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = Xdmx.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = Xdmx.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
@@ -105,4 +105,4 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST = $(appman_SOURCES)
+EXTRA_DIST = $(appman_PRE)
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 568a4f4ae..e2ea56efc 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -50,8 +50,8 @@ dmxtodmx_LDADD = -L. -ldmxconfig
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
@@ -67,7 +67,7 @@ MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|'
sed $(MAN_SUBSTS) < $< > $@
EXTRA_DIST = \
- $(appman_SOURCES) \
+ $(appman_PRE) \
test-a.in test-a.out \
test-b.in test-b.out \
test-c.in test-c.out \
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 175bd7b28..dce0d49e1 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -29,11 +29,11 @@ include $(top_srcdir)/cpprules.in
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = Xvfb.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = Xvfb.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xfree86/getconfig/Makefile.am b/hw/xfree86/getconfig/Makefile.am
index 2c8e642b6..acd1d9f17 100644
--- a/hw/xfree86/getconfig/Makefile.am
+++ b/hw/xfree86/getconfig/Makefile.am
@@ -34,8 +34,8 @@ dist_getconfig_DATA = xorg.cfg cfg.sample
include $(top_srcdir)/cpprules.in
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = getconfig.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = getconfig.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
filemandir = $(FILE_MAN_DIR)
fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
@@ -50,7 +50,7 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
-rm -f $@
$(LN_S) $< $@
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA) $(fileman_DATA) cfg.man
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA) $(fileman_DATA) cfg.man
EXTRA_DIST = cfg.man.pre getconfig.man.pre
diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am
index f77dddd73..b14d0c13c 100644
--- a/hw/xfree86/utils/gtf/Makefile.am
+++ b/hw/xfree86/utils/gtf/Makefile.am
@@ -34,14 +34,14 @@ gtf_LDADD = -lm
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = gtf.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = gtf.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = gtf.man.pre
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xfree86/utils/kbd_mode/Makefile.am b/hw/xfree86/utils/kbd_mode/Makefile.am
index 8469b6047..ebd7ffb24 100644
--- a/hw/xfree86/utils/kbd_mode/Makefile.am
+++ b/hw/xfree86/utils/kbd_mode/Makefile.am
@@ -45,10 +45,10 @@ endif
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = kbd_mode.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+appman_PRE = kbd_mode.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
all-local: kbd_mode.man.pre $(appman_DATA)
diff --git a/hw/xfree86/utils/pcitweak/Makefile.am b/hw/xfree86/utils/pcitweak/Makefile.am
index 2a242afbf..4966fb4ad 100644
--- a/hw/xfree86/utils/pcitweak/Makefile.am
+++ b/hw/xfree86/utils/pcitweak/Makefile.am
@@ -43,14 +43,14 @@ pcitweak_SOURCES = \
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = pcitweak.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = pcitweak.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = pcitweak.man.pre
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xfree86/utils/scanpci/Makefile.am b/hw/xfree86/utils/scanpci/Makefile.am
index bede5f064..a379e92ea 100644
--- a/hw/xfree86/utils/scanpci/Makefile.am
+++ b/hw/xfree86/utils/scanpci/Makefile.am
@@ -45,14 +45,14 @@ scanpci_SOURCES = \
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = scanpci.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = scanpci.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = scanpci.man.pre
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index 53e0b3366..5f9d78f7e 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -137,13 +137,13 @@ XOrgCfg: XOrgCfg.pre
# Man page
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = xorgcfg.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = xorgcfg.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-all-local: $(appman_SOURCES) $(appman_DATA)
+all-local: $(appman_PRE) $(appman_DATA)
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
-BUILT_SOURCES = $(appman_SOURCES)
+BUILT_SOURCES = $(appman_PRE)
CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am
index 83301b1d9..4f3d62049 100644
--- a/hw/xfree86/utils/xorgconfig/Makefile.am
+++ b/hw/xfree86/utils/xorgconfig/Makefile.am
@@ -49,15 +49,15 @@ include $(top_srcdir)/cpprules.in
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = xorgconfig.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = xorgconfig.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
-D__XSERVERNAME__=$(XSERVERNAME)
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 6b38a46c4..b822a94c0 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -71,15 +71,15 @@ include $(top_srcdir)/cpprules.in
appmandir = $(APP_MAN_DIR)
-appman_SOURCES = Xnest.man
-appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
+appman_PRE = Xnest.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
-D__XSERVERNAME__=$(XSERVERNAME)
-BUILT_SOURCES = $(appman_SOURCES)
-CLEANFILES = $(appman_SOURCES) $(appman_DATA)
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 22:40:34 +0000