Move building of StringDefs files to src and fix them so that parallel make

    works right.

1 files changed, 1 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 6ec9cda..f64b433 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = util . src include man
+SUBDIRS = util src include man
 
 AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_builddir)/include/X11
 
@@ -31,29 +31,3 @@ pkgconfig_DATA = xt.pc
 
 EXTRA_DIST = xt.pc.in autogen.sh
 
-#
-# The util directory contains a program that builds some of the sources. 
-# The input to this program is given in files. Unfortunately those input
-# files refers to things like
-# 
-# 	util/foo
-# 
-# so the generating program must be run from this directory. We can't run 
-# the program before it has been compiled, so the SUBDIRS order must be
-# 
-# 	util . src include man
-# 
-
-BUILT_FILES = $(top_builddir)/src/StringDefs.c $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h
-
-STRING_LIST = $(top_srcdir)/util/string.list
-
-all-local: $(BUILT_FILES)
-
-$(BUILT_FILES):
-	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
-	$(install_sh_DATA) -d $(top_builddir)/src $(top_builddir)/include/X11
-	$(install_sh_DATA) StringDefs.c $(top_builddir)/src
-	$(install_sh_DATA) $(top_builddir)/StringDefs.h $(top_builddir)/include/X11/
-	$(install_sh_DATA) $(top_builddir)/Shell.h $(top_builddir)/include/X11/
-	rm StringDefs.c StringDefs.h Shell.h