fix build in a builddir

wildcards considered harmful
also remove empty subdirectories

11 files changed, 28 insertions, 20 deletions

diff --git a/sgml/Makefile.am b/sgml/Makefile.am
index 5c9a72d..83aedc4 100644
--- a/sgml/Makefile.am
+++ b/sgml/Makefile.am
@@ -20,9 +20,16 @@
 #
 #  Process this file with autoconf to create configure.
 
-SUBDIRS = core ddx fonts graphics input output platforms registry security
+SUBDIRS = core fonts graphics input platforms security
 
 x11docdir = @X11DOCDIR@
+SGML_FILES = \
+	Install.sgml \
+	LICENSE.sgml \
+	README.sgml \
+	RELNOTES.sgml \
+	Versions.sgml
+
 include $(top_srcdir)/sgmlrules.in
 
 EXTRA_DIST = \
diff --git a/sgml/core/Makefile.am b/sgml/core/Makefile.am
index a9c578f..e34dd78 100644
--- a/sgml/core/Makefile.am
+++ b/sgml/core/Makefile.am
@@ -1,4 +1,5 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/core
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = Xserver-spec.sgml
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgml/ddx/Makefile.am b/sgml/ddx/Makefile.am
deleted file mode 100644
index 3a27c4d..0000000
--- a/sgml/ddx/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-#  Process this file with automake to create Makefile.in
-
-x11docdir = @X11DOCDIR@/ddx
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
diff --git a/sgml/fonts/Makefile.am b/sgml/fonts/Makefile.am
index e71f3de..e83dde7 100644
--- a/sgml/fonts/Makefile.am
+++ b/sgml/fonts/Makefile.am
@@ -1,4 +1,5 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/fonts
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = fonts.sgml
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgml/graphics/Makefile.am b/sgml/graphics/Makefile.am
index a87a4a7..c8c0f56 100644
--- a/sgml/graphics/Makefile.am
+++ b/sgml/graphics/Makefile.am
@@ -1,4 +1,5 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/graphics
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = dps.sgml
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgml/input/Makefile.am b/sgml/input/Makefile.am
index 0d3e612..78b2948 100644
--- a/sgml/input/Makefile.am
+++ b/sgml/input/Makefile.am
@@ -1,4 +1,5 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/input
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = XKB-Config.sgml XKB-Enhancing.sgml
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgml/output/Makefile.am b/sgml/output/Makefile.am
deleted file mode 100644
index 3a203aa..0000000
--- a/sgml/output/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-#  Process this file with automake to create Makefile.in
-
-x11docdir = @X11DOCDIR@/output
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
diff --git a/sgml/platforms/Makefile.am b/sgml/platforms/Makefile.am
index d7935e1..9542305 100644
--- a/sgml/platforms/Makefile.am
+++ b/sgml/platforms/Makefile.am
@@ -1,4 +1,13 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/platforms
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = \
+	Darwin.sgml \
+	LynxOS.sgml \
+	NetBSD.sgml \
+	OS2Notes.sgml \
+	OpenBSD.sgml \
+	SCO.sgml \
+	Solaris.sgml
+
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgml/registry/Makefile.am b/sgml/registry/Makefile.am
deleted file mode 100644
index 524f163..0000000
--- a/sgml/registry/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-#  Process this file with automake to create Makefile.in
-
-x11docdir = @X11DOCDIR@/registry
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
diff --git a/sgml/security/Makefile.am b/sgml/security/Makefile.am
index 53c2fe4..01a95ff 100644
--- a/sgml/security/Makefile.am
+++ b/sgml/security/Makefile.am
@@ -1,4 +1,5 @@
 #  Process this file with automake to create Makefile.in
 
 x11docdir = @X11DOCDIR@/security
-include $(top_srcdir)/sgmlrules.in
\ No newline at end of file
+SGML_FILES = XACE-Spec.sgml
+include $(top_srcdir)/sgmlrules.in
diff --git a/sgmlrules.in b/sgmlrules.in
index 7b88116..ca9c53f 100644
--- a/sgmlrules.in
+++ b/sgmlrules.in
@@ -20,7 +20,6 @@
 #
 #  This file is included by Makefile.am in this directory and subdirectories.
 
-SGML_FILES = $(wildcard *.sgml)
 TXT_FILES  = $(SGML_FILES:%.sgml=%.txt)
 PS_FILES   = $(SGML_FILES:%.sgml=%.ps)
 PDF_FILES  = $(SGML_FILES:%.sgml=%.pdf)