diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | src/Makefile.am | 26 |
3 files changed, 34 insertions, 27 deletions
@@ -1,3 +1,10 @@ +2005-08-01 Keith Packard <keithp@keithp.com> + + * Makefile.am: + * src/Makefile.am: + Move building of StringDefs files to src and + fix them so that parallel make works right. + 2005-07-08 Keith Packard <keithp@keithp.com> * .cvsignore: 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 diff --git a/src/Makefile.am b/src/Makefile.am index 0a99092..fd43134 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -71,3 +71,29 @@ DISTCLEANFILES = StringDefs.c libXt_la_LIBADD = @XT_LIBS@ libXt_la_LDFLAGS = -version-number 6:0:0 -no-undefined + +# +# 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 the top directory. +# + +BUILT_SOURCE = StringDefs.c +BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h + +STRING_LIST = $(top_srcdir)/util/string.list + +all-local: $(BUILT_FILES) + +$(BUILT_HEADER): $(BUILT_SOURCE) + +$(BUILT_SOURCE): + $(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.h $(top_builddir)/include/X11/ + $(install_sh_DATA) Shell.h $(top_builddir)/include/X11/ + rm StringDefs.h Shell.h |