github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-02-04 16:51:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to allow "make dist" etc. to work again.

Browse Source
This commit is contained in:
Paul Smith 2005-05-10 01:38:18 +00:00
parent e4c14a675c
commit 26d8d00cb7
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2005-05-07 Paul D. Smith <psmith@gnu.org>
* main.c (die): If we're dying with a fatal error (not that a * main.c (die): If we're dying with a fatal error (not that a

11
Makefile.am
View File

@ -3,14 +3,15 @@
AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr
ACLOCAL_AMFLAGS = -I config ACLOCAL_AMFLAGS = -I config
SUBDIRS = glob config po doc
# Only process if target is MS-Windows # Only process if target is MS-Windows
if WINDOWSENV if WINDOWSENV
SUBDIRS += w32 MAYBE_W32 = w32
W32INC := -I $(top_srcdir)/w32/include W32INC = -I $(top_srcdir)/w32/include
W32LIB := -Lw32 -lw32 W32LIB = -Lw32 -lw32
endif endif
SUBDIRS = glob config po doc $(MAYBE_W32)
bin_PROGRAMS = make bin_PROGRAMS = make
if USE_CUSTOMS 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 \ misc.c read.c remake.c $(remote) rule.c signame.c \
variable.c version.c vpath.c hash.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 \ noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
debug.h getopt.h gettext.h hash.h debug.h getopt.h gettext.h hash.h

9
configure.in
View File

@ -356,7 +356,7 @@ MAKE_HOST="$host"
AC_SUBST(MAKE_HOST) AC_SUBST(MAKE_HOST)
w32_target_env=no w32_target_env=no
AM_CONDITIONAL(WINDOWSENV, false) AM_CONDITIONAL([WINDOWSENV], false)
case "$host" in case "$host" in
*-*-mingw32) *-*-mingw32)
@ -425,12 +425,7 @@ esac
# Specify what files are to be created. # Specify what files are to be created.
AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile) AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile w32/Makefile)
# Only process if target is MS-Windows
if test "$w32_target_env" == yes; then
AC_CONFIG_FILES(w32/Makefile)
fi
# OK, do it! # OK, do it!

2
maintMakefile
View File

@ -157,7 +157,7 @@ get-config/config.guess get-config/config.sub:
&& $(WGET) $(config-url) -O $(target).t \ && $(WGET) $(config-url) -O $(target).t \
&& $(move_if_change) && $(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: get-config/texinfo.tex:
@echo $(WGET) $(gnulib-url) -O $(target) \ @echo $(WGET) $(gnulib-url) -O $(target) \
&& $(WGET) $(gnulib-url) -O $(target).t \ && $(WGET) $(gnulib-url) -O $(target).t \

4
po/ChangeLog
View File

@ -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> 2005-04-06 Paul D. Smith <psmith@gnu.org>
* LINGUAS: Added a new translation for Kinywarwanda (rw). * LINGUAS: Added a new translation for Kinywarwanda (rw).

1
po/POTFILES.in
View File

@ -22,4 +22,5 @@ signame.c
variable.c variable.c
variable.h variable.h
vmsfunctions.c vmsfunctions.c
vmsjobs.c
vpath.c vpath.c