diff options
author | Alexandre Oliva <oliva@gcc.gnu.org> | 1999-02-24 02:45:48 +0000 |
---|---|---|
committer | Alexandre Oliva <oliva@gcc.gnu.org> | 1999-02-24 02:45:48 +0000 |
commit | bbc4fb5fd19d14386c19d6e2b66e0012fe6cf8e4 (patch) | |
tree | aff5a223770b77781e8c3b0d4741deea536d7e1a | |
parent | b0759f454140000ac0d30b5c5245d5ef2efdb0e3 (diff) | |
download | gcc-bbc4fb5fd19d14386c19d6e2b66e0012fe6cf8e4.tar.gz |
Merge from trunk
From-SVN: r25394
-rw-r--r-- | texinfo/ChangeLog | 34 | ||||
-rw-r--r-- | texinfo/Makefile.am | 8 | ||||
-rw-r--r-- | texinfo/Makefile.in | 39 | ||||
-rw-r--r-- | texinfo/doc/Makefile.in | 63 | ||||
-rw-r--r-- | texinfo/info/Makefile.in | 88 | ||||
-rw-r--r-- | texinfo/lib/Makefile.in | 71 | ||||
-rw-r--r-- | texinfo/lib/strdup.c | 3 | ||||
-rw-r--r-- | texinfo/libtxi/strdup.c | 3 | ||||
-rw-r--r-- | texinfo/makeinfo/Makefile.am | 4 | ||||
-rw-r--r-- | texinfo/makeinfo/Makefile.in | 112 | ||||
-rw-r--r-- | texinfo/util/Makefile.am | 6 | ||||
-rw-r--r-- | texinfo/util/Makefile.in | 140 |
12 files changed, 230 insertions, 341 deletions
diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog index 80cda008b13..f5ac597ba11 100644 --- a/texinfo/ChangeLog +++ b/texinfo/ChangeLog @@ -1,3 +1,37 @@ +1999-02-24 Alexandre Oliva <oliva@dcc.unicamp.br> + + * lib/Makefile.in: Regen dependencies. + * makeinfo/Makefile.in, util/Makefile.in: Likewise. + +1999-02-01 Manfred Hollstein <manfred@s-direktnet.de> + + * util/Makefile.am (noinst_PROGRAMS): Renamed from "bin_PROGRAMS" + to avoid installing anything. + (noinst_SCRIPTS): Likewise. + * util/Makefile.in: Regenerate using automake-1.3. + +1999-01-21 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * Makefile.am (SUBDIRS): Include util again in order to generate + install-info. + * Makefile.in: Rebuild. + +1998-11-20 Manfred Hollstein <manfred@s-direktnet.de> + + * makeinfo/Makefile.am (noinst_PROGRAMS): Renamed from bin_PROGRAMS + to avoid installing makeinfo. + * makeinfo/Makefile.in: Regenerate using automake-1.3. + +Thu Oct 15 20:40:34 1998 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.in: rebuilt with --include-deps, --build-dir and + --srcdir-name + * doc/Makefile.in: ditto + * info/Makefile.in: ditto + * lib/Makefile.in: ditto + * makeinfo/Makefile.in: ditto + * util/Makefile.in: ditto + Mon Jul 6 22:52:28 1998 Tobias Naehring <naehring@eeetw3.et.tu-dresden.de> * makeinfo/makeinfo.c (add_word_args): Fix thinko. diff --git a/texinfo/Makefile.am b/texinfo/Makefile.am index 53c212827e6..6919265226c 100644 --- a/texinfo/Makefile.am +++ b/texinfo/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am for texinfo. -## $Id: Makefile.am,v 1.5 1998/04/10 00:37:57 law Exp $ +## $Id: Makefile.am,v 1.6 1999/01/21 10:39:10 gerald Exp $ ## Process this file with automake to produce Makefile.in in all directories. # Be sure we're using the right version of Automake. @@ -15,5 +15,7 @@ EXTRA_DIST = INTRODUCTION dir-example # Others are alphabetical. SUBDIRS = intl lib info makeinfo po util doc # ??? For EGCS, only build the stuff we actually need. This eliminates the -# need for xgettext that exists in the po subdirectory. -SUBDIRS = intl lib makeinfo +# need for xgettext that exists in the po subdirectory. We do need util in +# order to get install-info, which is used as part of the gcc build/install +# process. +SUBDIRS = intl lib makeinfo util diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in index da6da65c177..5410efa307c 100644 --- a/texinfo/Makefile.in +++ b/texinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -35,6 +35,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -70,7 +72,6 @@ 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@ @@ -103,8 +104,10 @@ EXTRA_DIST = INTRODUCTION dir-example # Others are alphabetical. SUBDIRS = intl lib info makeinfo po util doc # ??? For EGCS, only build the stuff we actually need. This eliminates the -# need for xgettext that exists in the po subdirectory. -SUBDIRS = intl lib makeinfo +# need for xgettext that exists in the po subdirectory. We do need util in +# order to get install-info, which is used as part of the gcc build/install +# process. +SUBDIRS = intl lib makeinfo util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -119,13 +122,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -default: all +all: all-recursive-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -259,11 +262,6 @@ 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 \ @@ -299,8 +297,6 @@ install: install-recursive uninstall: uninstall-recursive -all: all-recursive-am all-am - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive @@ -341,12 +337,11 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "it deletes files that may require special tools to rebuild." -rm -f config.status -.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ installcheck all-recursive-am all-am install-exec install-data install \ diff --git a/texinfo/doc/Makefile.in b/texinfo/doc/Makefile.in index c1c5e4fe800..227611e6713 100644 --- a/texinfo/doc/Makefile.in +++ b/texinfo/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,6 +32,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -67,7 +69,6 @@ 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@ @@ -104,7 +105,7 @@ CONFIG_CLEAN_FILES = TEXI2DVI = texi2dvi TEXINFO_TEX = $(top_srcdir)/../texinfo.tex INFO_DEPS = info-stnd.info info.info texinfo -DVIS = info-stnd.dvi info.dvi texinfo.txi.dvi +DVIS = info-stnd.dvi info.dvi texinfo.dvi TEXINFOS = info-stnd.texi info.texi texinfo.txi DIST_COMMON = README $(info_TEXINFOS) Makefile.am Makefile.in \ texinfo.tex @@ -114,14 +115,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -default: all +all: Makefile $(INFO_DEPS) .SUFFIXES: -.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 +.SUFFIXES: .dvi .info .ps .texi .texinfo .txi +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -135,7 +136,7 @@ info.dvi: info.texi $(info_TEXINFOS) texinfo: texinfo.txi -texinfo.txi.dvi: texinfo.txi +texinfo.dvi: texinfo.txi DVIPS = dvips @@ -162,6 +163,20 @@ DVIPS = dvips .texinfo.dvi: 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=$(top_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 $@ @@ -172,11 +187,11 @@ uninstall-info: else ii=; fi; \ for file in $(INFO_DEPS); do \ test -z "$ii" \ - || install-info --info-dir=$(infodir) --remove $$file; \ + || install-info --info-dir=$(DESTDIR)$(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]); \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done mostlyclean-aminfo: @@ -187,12 +202,11 @@ 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.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 + 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 clean-aminfo: @@ -214,11 +228,6 @@ 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 \ @@ -242,12 +251,10 @@ install: install-exec install-data all uninstall: uninstall-info -all: Makefile $(INFO_DEPS) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(infodir) + $(mkinstalldirs) $(DESTDIR)$(infodir) mostlyclean-generic: @@ -276,7 +283,7 @@ maintainer-clean: maintainer-clean-aminfo maintainer-clean-generic \ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default install-info-am uninstall-info mostlyclean-aminfo \ +.PHONY: install-info-am uninstall-info mostlyclean-aminfo \ distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir info \ dvi installcheck install-exec install-data install uninstall all \ installdirs mostlyclean-generic distclean-generic clean-generic \ diff --git a/texinfo/info/Makefile.in b/texinfo/info/Makefile.in index 5fac6225886..be8888328b2 100644 --- a/texinfo/info/Makefile.in +++ b/texinfo/info/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,6 +32,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -66,7 +68,6 @@ 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@ @@ -157,24 +158,17 @@ 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) -default: all +all: Makefile $(PROGRAMS) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu info/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps info/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -190,18 +184,18 @@ maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done mostlyclean-noinstPROGRAMS: @@ -213,6 +207,9 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: +.c.o: + $(COMPILE) -c $< + .s.o: $(COMPILE) -c $< @@ -267,37 +264,12 @@ 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 - -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 @@ -314,12 +286,10 @@ install: install-exec install-data all uninstall: uninstall-binPROGRAMS -all: Makefile $(PROGRAMS) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DATADIR)$(bindir) mostlyclean-generic: @@ -337,35 +307,33 @@ 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-depend \ + mostlyclean-compile mostlyclean-tags \ mostlyclean-generic clean: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile clean-tags \ - clean-depend clean-generic mostlyclean + clean-generic mostlyclean distclean: distclean-binPROGRAMS distclean-noinstPROGRAMS \ - distclean-compile distclean-tags distclean-depend \ - distclean-generic clean + distclean-compile distclean-tags distclean-generic \ + clean -rm -f config.status maintainer-clean: maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ -clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ -install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS 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 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 \ +clean-tags maintainer-clean-tags distdir 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 f54fb45f348..ad8aa283be7 100644 --- a/texinfo/lib/Makefile.in +++ b/texinfo/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,6 +32,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -67,7 +69,6 @@ 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@ @@ -121,20 +122,17 @@ 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) -default: all +all: Makefile $(LIBRARIES) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -148,6 +146,9 @@ distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: +.c.o: + $(COMPILE) -c $< + .s.o: $(COMPILE) -c $< @@ -199,37 +200,17 @@ 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 getopt.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 @@ -246,8 +227,6 @@ install: install-exec install-data all uninstall: -all: Makefile $(LIBRARIES) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: @@ -268,30 +247,28 @@ 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-depend mostlyclean-generic + mostlyclean-tags mostlyclean-generic -clean: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ - clean-generic mostlyclean +clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ + mostlyclean distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ - distclean-depend distclean-generic clean + distclean-generic clean -rm -f config.status maintainer-clean: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +.PHONY: mostlyclean-noinstLIBRARIES distclean-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 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 \ +clean-tags maintainer-clean-tags distdir 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/strdup.c b/texinfo/lib/strdup.c index 1d60f13948a..c88ecabf036 100644 --- a/texinfo/lib/strdup.c +++ b/texinfo/lib/strdup.c @@ -13,7 +13,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/texinfo/libtxi/strdup.c b/texinfo/libtxi/strdup.c index 1d60f13948a..c88ecabf036 100644 --- a/texinfo/libtxi/strdup.c +++ b/texinfo/libtxi/strdup.c @@ -13,7 +13,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/texinfo/makeinfo/Makefile.am b/texinfo/makeinfo/Makefile.am index 536a27849cb..07ec8221e72 100644 --- a/texinfo/makeinfo/Makefile.am +++ b/texinfo/makeinfo/Makefile.am @@ -1,8 +1,8 @@ ## Makefile.am for texinfo/makeinfo. -## $Id: Makefile.am,v 1.3 1998/03/24 19:41:22 law Exp $ +## $Id: Makefile.am,v 1.4 1998/11/19 22:39:54 manfred Exp $ ## Run automake in .. to produce Makefile.in from this. -bin_PROGRAMS = makeinfo +noinst_PROGRAMS = makeinfo localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" diff --git a/texinfo/makeinfo/Makefile.in b/texinfo/makeinfo/Makefile.in index 1837641140c..a13701c7e46 100644 --- a/texinfo/makeinfo/Makefile.in +++ b/texinfo/makeinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,6 +32,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -67,7 +69,6 @@ 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@ @@ -89,7 +90,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ -bin_PROGRAMS = makeinfo +noinst_PROGRAMS = makeinfo localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" @@ -101,8 +102,8 @@ EXTRA_DIST = README mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = makeinfo$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) +noinst_PROGRAMS = makeinfo$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I.. @@ -123,46 +124,32 @@ 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) -default: all +all: Makefile $(PROGRAMS) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu makeinfo/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps makeinfo/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-binPROGRAMS: +mostlyclean-noinstPROGRAMS: -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -distclean-binPROGRAMS: +distclean-noinstPROGRAMS: -maintainer-clean-binPROGRAMS: +maintainer-clean-noinstPROGRAMS: -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - $(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 $< @@ -214,43 +201,22 @@ 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 $(MAKE) installcheck: -install-exec: install-binPROGRAMS +install-exec: @$(NORMAL_INSTALL) install-data: @@ -259,14 +225,11 @@ install-data: install: install-exec install-data all @: -uninstall: uninstall-binPROGRAMS - -all: Makefile $(PROGRAMS) +uninstall: install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(bindir) mostlyclean-generic: @@ -283,30 +246,29 @@ distclean-generic: 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-depend mostlyclean-generic +mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \ - clean-generic mostlyclean +clean: clean-noinstPROGRAMS clean-compile clean-tags clean-generic \ + mostlyclean -distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-depend distclean-generic clean +distclean: distclean-noinstPROGRAMS distclean-compile distclean-tags \ + distclean-generic clean -rm -f config.status -maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-tags maintainer-clean-depend \ +maintainer-clean: maintainer-clean-noinstPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ -clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ -install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ +.PHONY: 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 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 \ +clean-tags maintainer-clean-tags distdir 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.am b/texinfo/util/Makefile.am index de4d0db99f9..3ed17b87a18 100644 --- a/texinfo/util/Makefile.am +++ b/texinfo/util/Makefile.am @@ -1,9 +1,9 @@ ## Makefile.am for texinfo/util. -## $Id: Makefile.am,v 1.3 1998/03/24 19:41:36 law Exp $ +## $Id: Makefile.am,v 1.4 1999/02/01 10:33:57 manfred Exp $ ## Run automake in .. to produce Makefile.in from this. -bin_PROGRAMS = install-info texindex -bin_SCRIPTS = texi2dvi +noinst_PROGRAMS = install-info texindex +noinst_SCRIPTS = texi2dvi localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" diff --git a/texinfo/util/Makefile.in b/texinfo/util/Makefile.in index 1515d6ebeb3..f84608e16e7 100644 --- a/texinfo/util/Makefile.in +++ b/texinfo/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2e from Makefile.am +# Makefile.in generated automatically by automake 1.3 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 = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,6 +32,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -67,7 +69,6 @@ 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@ @@ -89,8 +90,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ -bin_PROGRAMS = install-info texindex -bin_SCRIPTS = texi2dvi +noinst_PROGRAMS = install-info texindex +noinst_SCRIPTS = texi2dvi localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" @@ -101,8 +102,8 @@ EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = install-info$(EXEEXT) texindex$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) +noinst_PROGRAMS = install-info$(EXEEXT) texindex$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I.. @@ -119,7 +120,7 @@ texindex_OBJECTS = texindex.o texindex_LDADD = $(LDADD) texindex_DEPENDENCIES = ../lib/libtxi.a texindex_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) +SCRIPTS = $(noinst_SCRIPTS) CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -131,46 +132,32 @@ 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 -default: all +all: Makefile $(PROGRAMS) $(SCRIPTS) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-binPROGRAMS: +mostlyclean-noinstPROGRAMS: -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -distclean-binPROGRAMS: +distclean-noinstPROGRAMS: -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ - done +maintainer-clean-noinstPROGRAMS: -uninstall-binPROGRAMS: - $(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 $< @@ -196,25 +183,6 @@ texindex$(EXEEXT): $(texindex_OBJECTS) $(texindex_DEPENDENCIES) @rm -f texindex$(EXEEXT) $(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - $(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ - done - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -245,43 +213,22 @@ 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 $(MAKE) installcheck: -install-exec: install-binPROGRAMS install-binSCRIPTS +install-exec: @$(NORMAL_INSTALL) install-data: @@ -290,14 +237,11 @@ install-data: install: install-exec install-data all @: -uninstall: uninstall-binPROGRAMS uninstall-binSCRIPTS - -all: Makefile $(PROGRAMS) $(SCRIPTS) +uninstall: install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(bindir) $(bindir) mostlyclean-generic: @@ -314,32 +258,30 @@ distclean-generic: 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-depend mostlyclean-generic +mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \ - clean-generic mostlyclean +clean: clean-noinstPROGRAMS clean-compile clean-tags clean-generic \ + mostlyclean -distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-depend distclean-generic clean +distclean: distclean-noinstPROGRAMS distclean-compile distclean-tags \ + distclean-generic clean -rm -f config.status -maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-tags maintainer-clean-depend \ +maintainer-clean: maintainer-clean-noinstPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ -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 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 +.PHONY: 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 \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. |