diff options
| author | Paul Smith <psmith@gnu.org> | 2005-05-10 01:38:18 +0000 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2005-05-10 01:38:18 +0000 |
| commit | 26d8d00cb77f0d71f72d4f61e7f38009dbef9715 (patch) | |
| tree | 90030c239cea27ff9dc8049eea04b67244d7e898 | |
| parent | e4c14a675ca6df1f31aac5d4571be695d76a7fd0 (diff) | |
| download | gunmake-26d8d00cb77f0d71f72d4f61e7f38009dbef9715.tar.gz | |
Fixes to allow "make dist" etc. to work again.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | maintMakefile | 2 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
6 files changed, 23 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2005-05-09 Paul D. Smith <psmith@gnu.org> + + * Makefile.am (EXTRA_make_SOURCES): Add vmsjobs.c + (MAYBE_W32): Rework how SUBDIRS are handled so that "make dist" + recurses to the w32 directory, even on non-Windows systems. Use + the method suggested in the automake manual. + * configure.in: Add w32/Makefile to AC_CONFIG_FILES. + * maintMakefile (gnulib-url): They moved the texinfo.tex files. + 2005-05-07 Paul D. Smith <psmith@gnu.org> * main.c (die): If we're dying with a fatal error (not that a diff --git a/Makefile.am b/Makefile.am index 0877aa2..c8c7cd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,14 +3,15 @@ AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr ACLOCAL_AMFLAGS = -I config -SUBDIRS = glob config po doc # Only process if target is MS-Windows if WINDOWSENV - SUBDIRS += w32 - W32INC := -I $(top_srcdir)/w32/include - W32LIB := -Lw32 -lw32 + MAYBE_W32 = w32 + W32INC = -I $(top_srcdir)/w32/include + W32LIB = -Lw32 -lw32 endif +SUBDIRS = glob config po doc $(MAYBE_W32) + bin_PROGRAMS = make if USE_CUSTOMS @@ -25,7 +26,7 @@ make_SOURCES = ar.c arscan.c commands.c default.c dir.c expand.c file.c \ misc.c read.c remake.c $(remote) rule.c signame.c \ variable.c version.c vpath.c hash.c -EXTRA_make_SOURCES = remote-stub.c remote-cstms.c +EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \ debug.h getopt.h gettext.h hash.h diff --git a/configure.in b/configure.in index 4d09f85..783d180 100644 --- a/configure.in +++ b/configure.in @@ -356,7 +356,7 @@ MAKE_HOST="$host" AC_SUBST(MAKE_HOST) w32_target_env=no -AM_CONDITIONAL(WINDOWSENV, false) +AM_CONDITIONAL([WINDOWSENV], false) case "$host" in *-*-mingw32) @@ -425,12 +425,7 @@ esac # Specify what files are to be created. -AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile) - -# Only process if target is MS-Windows -if test "$w32_target_env" == yes; then - AC_CONFIG_FILES(w32/Makefile) -fi +AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile w32/Makefile) # OK, do it! diff --git a/maintMakefile b/maintMakefile index 111e6a3..00432a7 100644 --- a/maintMakefile +++ b/maintMakefile @@ -157,7 +157,7 @@ get-config/config.guess get-config/config.sub: && $(WGET) $(config-url) -O $(target).t \ && $(move_if_change) -gnulib-url = $(savannah-url)/gnulib/gnulib/config/$(patsubst get-config/%,%,$@) +gnulib-url = $(savannah-url)/gnulib/gnulib/build-aux/$(patsubst get-config/%,%,$@) get-config/texinfo.tex: @echo $(WGET) $(gnulib-url) -O $(target) \ && $(WGET) $(gnulib-url) -O $(target).t \ diff --git a/po/ChangeLog b/po/ChangeLog index 59cafe9..437c1ea 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2005-05-09 Paul D. Smith <psmith@gnu.org> + + * POTFILES.in: Add new file vmsjobs.c. + 2005-04-06 Paul D. Smith <psmith@gnu.org> * LINGUAS: Added a new translation for Kinywarwanda (rw). diff --git a/po/POTFILES.in b/po/POTFILES.in index 30b7864..45d162f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -22,4 +22,5 @@ signame.c variable.c variable.h vmsfunctions.c +vmsjobs.c vpath.c |