From: Richard Henderson Date: Thu, 2 Apr 1998 03:45:22 +0000 (-0800) Subject: Update with automake patched for DATA=$(INSTALL_DATA) problem. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f388fb42f9b946247b133274e142dc771b0d5e2;p=gcc.git Update with automake patched for DATA=$(INSTALL_DATA) problem. From-SVN: r18948 --- diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in index 51989e7b42e..eb5dba42e32 100644 --- a/texinfo/Makefile.in +++ b/texinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -14,7 +14,7 @@ # 1.2f was the first version that supported .txi as a Texinfo suffix. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -62,16 +62,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -98,13 +103,13 @@ EXTRA_DIST = INTRODUCTION dir-example # Others are alphabetical. SUBDIRS = intl lib info makeinfo po util doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \ -config.h.in config.sub configure configure.in install-sh missing \ -mkinstalldirs stamp-h.in texinfo.tex +Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \ +aclocal.m4 config.guess config.h.in config.sub configure configure.in \ +missing mkinstalldirs stamp-h.in texinfo.tex DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -114,19 +119,19 @@ GZIP = --best default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in +$(ACLOCAL_M4): @MAINT@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h @@ -136,7 +141,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status @echo timestamp > stamp-h -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in +$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h cd $(top_srcdir) && $(AUTOHEADER) @echo timestamp > $(srcdir)/stamp-h.in @@ -251,6 +256,11 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ diff --git a/texinfo/doc/Makefile.in b/texinfo/doc/Makefile.in index c021d3e9ab3..c1c5e4fe800 100644 --- a/texinfo/doc/Makefile.in +++ b/texinfo/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -59,16 +59,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ @@ -93,13 +98,13 @@ EXTRA_DIST = macro.texi userdoc.texi epsf.tex texinfo.tex # We try to discover this via configure just to give a better help message. TEXMF = @TEXMF@ -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = TEXI2DVI = texi2dvi -TEXINFO_TEX = $(srcdir)/texinfo.tex +TEXINFO_TEX = $(top_srcdir)/../texinfo.tex INFO_DEPS = info-stnd.info info.info texinfo -DVIS = info-stnd.dvi info.dvi texinfo.dvi +DVIS = info-stnd.dvi info.dvi texinfo.txi.dvi TEXINFOS = info-stnd.texi info.texi texinfo.txi DIST_COMMON = README $(info_TEXINFOS) Makefile.am Makefile.in \ texinfo.tex @@ -112,11 +117,11 @@ GZIP = --best default: all .SUFFIXES: -.SUFFIXES: .dvi .info .ps .texi .texinfo .txi -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile +.SUFFIXES: .dvi .info .ps .texi .texinfo +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -130,13 +135,13 @@ info.dvi: info.texi $(info_TEXINFOS) texinfo: texinfo.txi -texinfo.dvi: texinfo.txi +texinfo.txi.dvi: texinfo.txi DVIPS = dvips .texi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=$(top_srcdir)/..:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .texi: @@ -155,22 +160,8 @@ DVIPS = dvips && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texinfo.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=$(top_srcdir)/..:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - -.txi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.txi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - -.txi: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .dvi.ps: $(DVIPS) $< -o $@ @@ -183,7 +174,7 @@ uninstall-info: test -z "$ii" \ || install-info --info-dir=$(infodir) --remove $$file; \ done - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) for file in $(INFO_DEPS); do \ (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done @@ -196,11 +187,12 @@ mostlyclean-aminfo: info-stnd.op info-stnd.tr info-stnd.cv info-stnd.cn info.aux \ info.cp info.cps info.dvi info.fn info.fns info.ky info.kys \ info.ps info.log info.pg info.toc info.tp info.tps info.vr \ - info.vrs info.op info.tr info.cv info.cn texinfo.aux \ - texinfo.cp texinfo.cps texinfo.dvi texinfo.fn texinfo.fns \ - texinfo.ky texinfo.kys texinfo.ps texinfo.log texinfo.pg \ - texinfo.toc texinfo.tp texinfo.tps texinfo.vr texinfo.vrs \ - texinfo.op texinfo.tr texinfo.cv texinfo.cn + info.vrs info.op info.tr info.cv info.cn texinfo.txi.aux \ + texinfo.txi.cp texinfo.txi.cps texinfo.txi.dvi texinfo.txi.fn \ + texinfo.txi.fns texinfo.txi.ky texinfo.txi.kys texinfo.txi.ps \ + texinfo.txi.log texinfo.txi.pg texinfo.txi.toc texinfo.txi.tp \ + texinfo.txi.tps texinfo.txi.vr texinfo.txi.vrs texinfo.txi.op \ + texinfo.txi.tr texinfo.txi.cv texinfo.txi.cn clean-aminfo: @@ -222,6 +214,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = doc distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ diff --git a/texinfo/info/Makefile.in b/texinfo/info/Makefile.in index c71d31959ec..5fac6225886 100644 --- a/texinfo/info/Makefile.in +++ b/texinfo/info/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -58,16 +58,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -121,9 +126,11 @@ BUILT_SOURCES = doc.c funs.h cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \ $(srcdir)/footnotes.c $(srcdir)/variables.c -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +bin_PROGRAMS = ginfo$(EXEEXT) +noinst_PROGRAMS = makedoc$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) CPPFLAGS = @CPPFLAGS@ @@ -143,13 +150,20 @@ makedoc_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in +DIST_COMMON = README Makefile.am Makefile.in NEWS DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best +DEP_FILES = .deps/dir.P .deps/display.P .deps/doc.P .deps/dribble.P \ +.deps/echo-area.P .deps/filesys.P .deps/footnotes.P .deps/gc.P \ +.deps/indices.P .deps/info-utils.P .deps/info.P .deps/infodoc.P \ +.deps/infomap.P .deps/m-x.P .deps/makedoc.P .deps/man.P \ +.deps/nodemenu.P .deps/nodes.P .deps/search.P .deps/session.P \ +.deps/signals.P .deps/terminal.P .deps/tilde.P .deps/variables.P \ +.deps/window.P SOURCES = $(ginfo_SOURCES) $(makedoc_SOURCES) OBJECTS = $(ginfo_OBJECTS) $(makedoc_OBJECTS) @@ -157,10 +171,10 @@ default: all .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps info/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu info/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -185,7 +199,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -199,9 +213,6 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -218,12 +229,12 @@ distclean-compile: maintainer-clean-compile: -ginfo: $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES) - @rm -f ginfo +ginfo$(EXEEXT): $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES) + @rm -f ginfo$(EXEEXT) $(LINK) $(ginfo_LDFLAGS) $(ginfo_OBJECTS) $(ginfo_LDADD) $(LIBS) -makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) - @rm -f makedoc +makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) + @rm -f makedoc$(EXEEXT) $(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS) tags: TAGS @@ -256,108 +267,37 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = info distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu info/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -dir.o: dir.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h tilde.h -display.o: display.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -doc.o: doc.c doc.h info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h footnotes.h gc.h \ - funs.h -dribble.o: dribble.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -echo-area.o: echo-area.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -filesys.o: filesys.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h tilde.h -footnotes.o: footnotes.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -gc.o: gc.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h -indices.o: indices.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h indices.h -info-utils.o: info-utils.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h man.h -info.o: info.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h \ - indices.h ../lib/getopt.h man.h -infodoc.o: infodoc.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -infomap.o: infomap.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h funs.h -m-x.o: m-x.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h -makedoc.o: makedoc.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -man.o: man.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h \ - signals.h tilde.h man.h -nodemenu.o: nodemenu.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -nodes.o: nodes.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h man.h -search.o: search.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h -session.o: session.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h man.h -signals.o: signals.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h signals.h -terminal.o: terminal.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h termdep.h -tilde.o: tilde.c info.h ../lib/system.h ../config.h filesys.h display.h \ - info-utils.h nodes.h window.h infomap.h search.h terminal.h \ - session.h dribble.h echo-area.h doc.h footnotes.h gc.h -variables.o: variables.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h variables.h -window.o: window.c info.h ../lib/system.h ../config.h filesys.h \ - display.h info-utils.h nodes.h window.h infomap.h search.h \ - terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \ - gc.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + DEPENDENCIES_OUTPUT='.deps/$(*F).P'; \ + export DEPENDENCIES_OUTPUT; \ + : > .deps/$(*F).P; \ + $(COMPILE) -c $< info: dvi: check: all @@ -397,21 +337,22 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ - mostlyclean-compile mostlyclean-tags \ + mostlyclean-compile mostlyclean-tags mostlyclean-depend \ mostlyclean-generic clean: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile clean-tags \ - clean-generic mostlyclean + clean-depend clean-generic mostlyclean distclean: distclean-binPROGRAMS distclean-noinstPROGRAMS \ - distclean-compile distclean-tags distclean-generic \ - clean + distclean-compile distclean-tags distclean-depend \ + distclean-generic clean -rm -f config.status maintainer-clean: maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-depend maintainer-clean-generic \ + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -421,9 +362,10 @@ install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/texinfo/lib/Makefile.in b/texinfo/lib/Makefile.in index 4612381824e..f54fb45f348 100644 --- a/texinfo/lib/Makefile.in +++ b/texinfo/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -59,16 +59,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -93,7 +98,7 @@ libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@ libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD) EXTRA_DIST = README -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -116,6 +121,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best +DEP_FILES = .deps/alloca.P .deps/getopt.P .deps/getopt1.P \ +.deps/memcpy.P .deps/memmove.P .deps/strdup.P .deps/strerror.P \ +.deps/xmalloc.P .deps/xstrdup.P SOURCES = $(libtxi_a_SOURCES) OBJECTS = $(libtxi_a_OBJECTS) @@ -123,10 +131,10 @@ default: all .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -140,9 +148,6 @@ distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -194,17 +199,37 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = lib distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -getopt.o: getopt.c ../config.h -getopt1.o: getopt1.c ../config.h getopt.h -xmalloc.o: xmalloc.c -xstrdup.o: xstrdup.c ../config.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + DEPENDENCIES_OUTPUT='.deps/$(*F).P'; \ + export DEPENDENCIES_OUTPUT; \ + : > .deps/$(*F).P; \ + $(COMPILE) -c $< info: dvi: check: all @@ -243,18 +268,19 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic -clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean +clean: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ - distclean-generic clean + distclean-depend distclean-generic clean -rm -f config.status maintainer-clean: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-depend maintainer-clean-generic \ + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -262,9 +288,10 @@ maintainer-clean: maintainer-clean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/texinfo/makeinfo/Makefile.in b/texinfo/makeinfo/Makefile.in index d1d76aba3fe..1837641140c 100644 --- a/texinfo/makeinfo/Makefile.in +++ b/texinfo/makeinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -59,16 +59,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -93,9 +98,10 @@ LDADD = ../lib/libtxi.a @INTLLIBS@ makeinfo_SOURCES = makeinfo.c makeinfo.h multi.c EXTRA_DIST = README -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +bin_PROGRAMS = makeinfo$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -117,6 +123,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best +DEP_FILES = .deps/makeinfo.P .deps/multi.P SOURCES = $(makeinfo_SOURCES) OBJECTS = $(makeinfo_OBJECTS) @@ -124,10 +131,10 @@ default: all .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps makeinfo/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu makeinfo/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -152,14 +159,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -176,8 +180,8 @@ distclean-compile: maintainer-clean-compile: -makeinfo: $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES) - @rm -f makeinfo +makeinfo$(EXEEXT): $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES) + @rm -f makeinfo$(EXEEXT) $(LINK) $(makeinfo_LDFLAGS) $(makeinfo_OBJECTS) $(makeinfo_LDADD) $(LIBS) tags: TAGS @@ -210,16 +214,37 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = makeinfo distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu makeinfo/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -makeinfo.o: makeinfo.c ../lib/system.h ../config.h ../lib/getopt.h \ - makeinfo.h -multi.o: multi.c ../lib/system.h ../config.h makeinfo.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + DEPENDENCIES_OUTPUT='.deps/$(*F).P'; \ + export DEPENDENCIES_OUTPUT; \ + : > .deps/$(*F).P; \ + $(COMPILE) -c $< info: dvi: check: all @@ -259,18 +284,18 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean +clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean + distclean-depend distclean-generic clean -rm -f config.status maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-tags maintainer-clean-generic \ - distclean + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -278,9 +303,10 @@ maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/texinfo/util/Makefile.in b/texinfo/util/Makefile.in index 7b04741a6c6..1515d6ebeb3 100644 --- a/texinfo/util/Makefile.in +++ b/texinfo/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -59,16 +59,21 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -93,9 +98,10 @@ LDADD = ../lib/libtxi.a @INTLLIBS@ EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \ update-info -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +bin_PROGRAMS = install-info$(EXEEXT) texindex$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -118,13 +124,14 @@ SCRIPTS = $(bin_SCRIPTS) CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in +DIST_COMMON = README Makefile.am Makefile.in mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best +DEP_FILES = .deps/install-info.P .deps/texindex.P SOURCES = install-info.c texindex.c OBJECTS = install-info.o texindex.o @@ -132,10 +139,10 @@ default: all .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -160,14 +167,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -184,12 +188,12 @@ distclean-compile: maintainer-clean-compile: -install-info: $(install_info_OBJECTS) $(install_info_DEPENDENCIES) - @rm -f install-info +install-info$(EXEEXT): $(install_info_OBJECTS) $(install_info_DEPENDENCIES) + @rm -f install-info$(EXEEXT) $(LINK) $(install_info_LDFLAGS) $(install_info_OBJECTS) $(install_info_LDADD) $(LIBS) -texindex: $(texindex_OBJECTS) $(texindex_DEPENDENCIES) - @rm -f texindex +texindex$(EXEEXT): $(texindex_OBJECTS) $(texindex_DEPENDENCIES) + @rm -f texindex$(EXEEXT) $(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @@ -206,7 +210,7 @@ install-binSCRIPTS: $(bin_SCRIPTS) done uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_SCRIPTS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -241,16 +245,37 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = util distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu util/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -install-info.o: install-info.c ../lib/system.h ../config.h \ - ../lib/getopt.h -texindex.o: texindex.c ../lib/system.h ../config.h ../lib/getopt.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + +maintainer-clean-depend: + -rm -rf .deps + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + DEPENDENCIES_OUTPUT='.deps/$(*F).P'; \ + export DEPENDENCIES_OUTPUT; \ + : > .deps/$(*F).P; \ + $(COMPILE) -c $< info: dvi: check: all @@ -290,18 +315,18 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean +clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean + distclean-depend distclean-generic clean -rm -f config.status maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-tags maintainer-clean-generic \ - distclean + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -310,8 +335,9 @@ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info dvi installcheck install-exec install-data install \ -uninstall all installdirs mostlyclean-generic distclean-generic \ +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info dvi installcheck install-exec install-data \ +install uninstall all installdirs mostlyclean-generic distclean-generic \ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean