* egcs-1.1b and Solaris make
@ 1998-10-09 19:52 Joe Buck
1998-10-11 2:41 ` Jeffrey A Law
0 siblings, 1 reply; 9+ messages in thread
From: Joe Buck @ 1998-10-09 19:52 UTC (permalink / raw)
To: egcs
I decided to investigate the issue of egcs requiring GNU Make further.
Step 1 was just seeing what happens if I use a different make, in this
case, Solaris make.
I configured egcs-1.1, and used --srcdir to build binaries in a separate
tree (therefore exercising VPATH) and without --enable-shared. I did
make bootstrap-lean. Both during the configure and the build, I used
a path such that make was /usr/ccs/bin/make, the Solaris make program.
libiberty built fine, but texinfo uses explicit GNU Make constructs in
both texinfo/lib and texinfo/makeinfo, of this form:
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
I simply commented out these two lines, and did a 'mkdir .deps' in
each directory. With this hack, Solaris make had no trouble building
texinfo.
Since other GNU tools have acceptable ways of doing dependencies without
requiring GNU make, texinfo should be fixed, I think.
At this stage, the three-stage bootstrap of the compiler itself went fine.
I suspect that any Posix-compliant make will have no trouble with it.
However, I then had a mysterious problem when building libio.
For some reason, some files were not built. I end with
-------------------------
ar rc libio.a filedoalloc.o floatconv.o genops.o fileops.o iovfprintf.o iovfscanf.o ioignore.o iopadn.o iofgetpos.o iofread.o iofscanf.o iofsetpos.o iogetdelim.o iogetline.o ioprintf.o ioseekoff.o ioseekpos.o outfloat.o strops.o iofclose.o iopopen.o ioungetc.o peekc.o iogetc.o ioputc.o iofeof.o ioferror.o iofdopen.o iofflush.o iofgets.o iofopen.o iofprintf.o iofputs.o iofwrite.o iogets.o ioperror.o ioputs.o ioscanf.o iosetbuffer.o iosetvbuf.o iosprintf.o iosscanf.o ioftell.o iovsscanf.o iovsprintf.o ioprims.o iostrerror.o cleanup.o stdfiles.o
ar: cannot open peekc.o
No such file or directory
ar: cannot open iogetc.o
No such file or directory
ar: cannot open ioputc.o
No such file or directory
ar: cannot open iofeof.o
No such file or directory
ar: cannot open ioferror.o
No such file or directory
ar: peekc.o not found
ar: iogetc.o not found
ar: ioputc.o not found
ar: iofeof.o not found
ar: ioferror.o not found
-------------------------
These five files are also not included in the dependency information.
But this is very odd, since they appear in IO_OBJECTS along with other
files that compile just fine. It's almost as if the IO_OBJECTS
variable were truncated. It is
IO_OBJECTS = filedoalloc.o floatconv.o genops.o fileops.o \
iovfprintf.o \
iovfscanf.o ioignore.o iopadn.o \
iofgetpos.o iofread.o iofscanf.o \
iofsetpos.o iogetdelim.o iogetline.o \
ioprintf.o ioseekoff.o ioseekpos.o \
outfloat.o strops.o iofclose.o iopopen.o ioungetc.o peekc.o iogetc.o \
ioputc.o iofeof.o ioferror.o
in <build-dir>/sparc-sun-solaris2.5.1/libio/Makefile.
If I just cd to that directory and type
make peekc.o
nothing happens; no commands are executed and make returns success.
However,
make qqq.o
says
make: Fatal error: Don't know how to make target `qqq.o'
I don't understand this. However, if I explicitly add
peekc.o: peekc.c
to the Makefile, peekc.o builds.
If I add five such lines, I can finish the build.
Joe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: egcs-1.1b and Solaris make
1998-10-09 19:52 egcs-1.1b and Solaris make Joe Buck
@ 1998-10-11 2:41 ` Jeffrey A Law
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
0 siblings, 1 reply; 9+ messages in thread
From: Jeffrey A Law @ 1998-10-11 2:41 UTC (permalink / raw)
To: Joe Buck; +Cc: egcs
In message < 199810100130.SAA26305@atrus.synopsys.com >you write:
> libiberty built fine, but texinfo uses explicit GNU Make constructs in
> both texinfo/lib and texinfo/makeinfo, of this form:
>
> DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
>
> -include $(DEP_FILES)
>
> I simply commented out these two lines, and did a 'mkdir .deps' in
> each directory. With this hack, Solaris make had no trouble building
> texinfo.
>
> Since other GNU tools have acceptable ways of doing dependencies without
> requiring GNU make, texinfo should be fixed, I think.
Agreed. Anyone want to check and see if it's already fixed? Are newer
releases of texinfo available?
> However, I then had a mysterious problem when building libio.
> For some reason, some files were not built. I end with
>
> -------------------------
> ar rc libio.a filedoalloc.o floatconv.o genops.o fileops.o iovfprintf.o i
> ovfscanf.o ioignore.o iopadn.o iofgetpos.o iofread.o iofscanf.o iofsetpos
> .o iogetdelim.o iogetline.o ioprintf.o ioseekoff.o ioseekpos.o outfloat.o
> strops.o iofclose.o iopopen.o ioungetc.o peekc.o iogetc.o ioputc.o iofeof
> .o ioferror.o iofdopen.o iofflush.o iofgets.o iofopen.o iofprintf.o iofputs
> .o iofwrite.o iogets.o ioperror.o ioputs.o ioscanf.o iosetbuffer.o iosetvb
> uf.o iosprintf.o iosscanf.o ioftell.o iovsscanf.o iovsprintf.o ioprims.o i
> ostrerror.o cleanup.o stdfiles.o
> ar: cannot open peekc.o
> No such file or directory
[ ... ]
Well, someone forgot to run "make depend" at some point in the past. Worse
yet, make depend wasn't working due to a typo.
I've fixed the typo and updated the dependencies.
jeff
^ permalink raw reply [flat|nested] 9+ messages in thread
* [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
1998-10-11 2:41 ` Jeffrey A Law
@ 1998-10-11 22:21 ` Alexandre Oliva
1998-10-12 1:06 ` Jeffrey A Law
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Alexandre Oliva @ 1998-10-11 22:21 UTC (permalink / raw)
To: law, egcs-patches; +Cc: Joe Buck, egcs
Jeffrey A Law <law@cygnus.com> writes:
> In message < 199810100130.SAA26305@atrus.synopsys.com >you write:
>> libiberty built fine, but texinfo uses explicit GNU Make constructs in
>> both texinfo/lib and texinfo/makeinfo, of this form:
>> Since other GNU tools have acceptable ways of doing dependencies without
>> requiring GNU make, texinfo should be fixed, I think.
> Agreed. Anyone want to check and see if it's already fixed? Are newer
> releases of texinfo available?
This has probably happened because development Makefile.in's have been
installed in the CVS tree. automake creates Makefile.in's with
automatic dependency tracking that works only with GNU make, until you
run `make dist'. When you do, it grabs all dependency information and
creates a Makefile.in that contains all that data, but does not
perform dependency tracking, and therefore does not depend on GNU
make.
An easy solution for this problem is to build texinfo then run, in the
texinfo directory of the *source* tree, run:
% automake --include-deps --build-dir=/root/of/build/tree/texinfo --gnu
automake 1.3 will complain that configure.in contains AM_GNU_GETTEXT
but the po directory is not in SUBDIRS. I've worked around this
problem by commenting out (dnl) the AM_GNU_GETTEXT line of
configure.in, running the line above, then reverting to the original
line. Maybe we should really remove the AM_GNU_GETTEXT line...
Should I commit the produced Makefile.ins?
>> However, I then had a mysterious problem when building libio.
>> For some reason, some files were not built. I end with
> Well, someone forgot to run "make depend" at some point in the past.
> Worse yet, make depend wasn't working due to a typo.
Unfortunately, your run of make depend has introduced several
dependencies of libc-lock.h, but there's no such file in my build
tree. I've re-run make depend to fix it locally, but it shouldn't
remain so in the CVS tree... What's up?
--
Alexandre Oliva
mailto:oliva@dcc.unicamp.br mailto:oliva@gnu.org mailto:aoliva@acm.org
http://www.dcc.unicamp.br/~oliva
Universidade Estadual de Campinas, SP, Brasil
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
@ 1998-10-12 1:06 ` Jeffrey A Law
1998-10-12 3:06 ` Alexandre Oliva
1998-10-12 16:07 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (2/2) Alexandre Oliva
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Jeffrey A Law @ 1998-10-12 1:06 UTC (permalink / raw)
To: Alexandre Oliva; +Cc: egcs-patches, Joe Buck, egcs
In message < orsogushx1.fsf@araguaia.dcc.unicamp.br >you write:
> >> However, I then had a mysterious problem when building libio.
> >> For some reason, some files were not built. I end with
>
> > Well, someone forgot to run "make depend" at some point in the past.
> > Worse yet, make depend wasn't working due to a typo.
>
> Unfortunately, your run of make depend has introduced several
> dependencies of libc-lock.h, but there's no such file in my build
> tree. I've re-run make depend to fix it locally, but it shouldn't
> remain so in the CVS tree... What's up?
No clue. I didn't look real closely at that horrible hunk of sed/awk code
in config.shared, nor did I want to.
libc-lock is probably created on linux systems only, and the sed script
probably doesn't filter it out.
Feel free to update the dependencies again and sed away the libc-lock in
config.shared for next time.
jeff
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
1998-10-12 1:06 ` Jeffrey A Law
@ 1998-10-12 3:06 ` Alexandre Oliva
1998-10-12 9:14 ` Jeffrey A Law
0 siblings, 1 reply; 9+ messages in thread
From: Alexandre Oliva @ 1998-10-12 3:06 UTC (permalink / raw)
To: law; +Cc: egcs-patches, Joe Buck, egcs
[-- Attachment #1: Type: text/plain, Size: 846 bytes --]
Jeffrey A Law <law@cygnus.com> writes:
>> Unfortunately, your run of make depend has introduced several
>> dependencies of libc-lock.h, but there's no such file in my build
>> tree. I've re-run make depend to fix it locally, but it shouldn't
>> remain so in the CVS tree... What's up?
> No clue. I didn't look real closely at that horrible hunk of sed/awk code
> in config.shared, nor did I want to.
> libc-lock is probably created on linux systems only, and the sed script
> probably doesn't filter it out.
Correct. Fixed in the attached patch. I've checked that it runs
correctly and produces the same results on Solaris2.5/sparc and
GNU/Linux/x86
Ok to install?
--
Alexandre Oliva
mailto:oliva@dcc.unicamp.br mailto:oliva@gnu.org mailto:aoliva@acm.org
http://www.dcc.unicamp.br/~oliva
Universidade Estadual de Campinas, SP, Brasil
[-- Attachment #2: libio.diff --]
[-- Type: text/x-diff, Size: 14549 bytes --]
Index: libio/ChangeLog
from Alexandre Oliva <oliva@dcc.unicamp.br>
* config.shared (depend.new): delete libc-lock.h from
dependencies, and fix _G_config.h -> $(_G_CONFIG_H) rule
* depend: Rebuilt.
Index: libio/config.shared
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libio/config.shared,v
retrieving revision 1.15
diff -u -r1.15 config.shared
--- libio/config.shared 1998/10/11 00:53:49 1.15
+++ libio/config.shared 1998/10/12 08:57:13
@@ -474,8 +474,8 @@
>depend.new
$(CXX) -M $(CXXINCLUDES) $(DEPEND_SOURCES) \
| sed -e 's|$(srcdir)/|$$(srcdir)/|g' \
- -e 's| [^ ]_G_config.h| $$(_G_CONFIG_H)|g' \
- -e 's| /[^ ]*||g' \
+ -e 's| [^ ]*_G_config.h| $$(_G_CONFIG_H)|g' \
+ -e 's| /[^ ]*||g' -e 's| libc-lock\.h||' \
-e '/^[ ]*\\$$/d' -e 's/^[ ]*$$//' \
| sed -e 's|$$(srcdir)/[.][.]|$$(srcdir)/$$(MULTISRCTOP)..|g' \
-e 's|$$(srcdir)/\([^/]*[.]c\)|\1|' \
Index: libio/depend
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libio/depend,v
retrieving revision 1.3
diff -u -r1.3 depend
--- libio/depend 1998/10/11 00:53:50 1.3
+++ libio/depend 1998/10/12 08:57:13
@@ -5,42 +5,39 @@
$(srcdir)/fstream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
SFile.o: SFile.cc \
- $(srcdir)/SFile.h $(srcdir)/fstream.h \
+ $(srcdir)/SFile.h \
+ $(srcdir)/fstream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
builtinbuf.o: builtinbuf.cc \
$(srcdir)/builtinbuf.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/iostreamP.h \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h
+ $(srcdir)/iolibio.h
editbuf.o: editbuf.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/editbuf.h \
$(srcdir)/fstream.h \
$(srcdir)/iostream.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/streambuf.h
filebuf.o: filebuf.cc \
$(srcdir)/iostreamP.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
$(srcdir)/builtinbuf.h
fstream.o: fstream.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/fstream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h
@@ -48,70 +45,63 @@
$(srcdir)/indstream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioassign.o: ioassign.cc \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h
+ $(srcdir)/iolibio.h
ioextend.o: ioextend.cc \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iomanip.o: iomanip.cc \
$(srcdir)/iomanip.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iostream.o: iostream.cc \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h
+ $(srcdir)/iolibio.h \
+ $(srcdir)/floatio.h
isgetline.o: isgetline.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/iostream.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/streambuf.h
isgetsb.o: isgetsb.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/iostream.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/streambuf.h
isscan.o: isscan.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/iostream.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/streambuf.h
osform.o: osform.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/iostream.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/streambuf.h
parsestream.o: parsestream.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/parsestream.h \
$(srcdir)/streambuf.h
pfstream.o: pfstream.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/pfstream.h \
$(srcdir)/fstream.h \
$(srcdir)/iostream.h \
@@ -119,53 +109,49 @@
$(srcdir)/procbuf.h
procbuf.o: procbuf.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/procbuf.h \
$(srcdir)/streambuf.h
sbform.o: sbform.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
+ $(srcdir)/streambuf.h
sbgetline.o: sbgetline.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/streambuf.h
sbscan.o: sbscan.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
- $(srcdir)/streambuf.h
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
+ $(srcdir)/streambuf.h
stdiostream.o: stdiostream.cc \
$(srcdir)/stdiostream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h
+ $(srcdir)/iolibio.h
stdstrbufs.o: stdstrbufs.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
+ $(srcdir)/stdiostream.h \
+ $(srcdir)/iostream.h \
+ $(srcdir)/streambuf.h
stdstreams.o: stdstreams.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/streambuf.h \
$(srcdir)/iostream.h
stream.o: stream.cc \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h $(srcdir)/libio.h \
+ $(srcdir)/iolibio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/stream.h \
$(srcdir)/iostream.h \
$(srcdir)/streambuf.h \
@@ -174,268 +160,220 @@
streambuf.o: streambuf.cc \
$(srcdir)/iostreamP.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h
strstream.o: strstream.cc \
$(srcdir)/iostreamP.h \
$(srcdir)/streambuf.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
$(srcdir)/strstream.h \
$(srcdir)/iostream.h \
- $(srcdir)/strfile.h
+ $(srcdir)/strfile.h
cleanup.o: cleanup.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
filedoalloc.o: filedoalloc.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
fileops.o: fileops.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
floatconv.o: floatconv.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
genops.o: genops.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofclose.o: iofclose.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofdopen.o: iofdopen.c \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h $(srcdir)/libio.h
+ $(srcdir)/iolibio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofeof.o: iofeof.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioferror.o: ioferror.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofflush.o: iofflush.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofflush_u.o: iofflush_u.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofgetpos.o: iofgetpos.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofgets.o: iofgets.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofopen.o: iofopen.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofprintf.o: iofprintf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofputs.o: iofputs.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofread.o: iofread.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofscanf.o: iofscanf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofsetpos.o: iofsetpos.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioftell.o: ioftell.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iofwrite.o: iofwrite.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iogetc.o: iogetc.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iogetdelim.o: iogetdelim.c \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h $(srcdir)/libio.h
+ $(srcdir)/iolibio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iogetline.o: iogetline.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iogets.o: iogets.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioignore.o: ioignore.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iopadn.o: iopadn.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioperror.o: ioperror.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iopopen.o: iopopen.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioprims.o: ioprims.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioprintf.o: ioprintf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioputc.o: ioputc.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioputs.o: ioputs.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioscanf.o: ioscanf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioseekoff.o: ioseekoff.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioseekpos.o: ioseekpos.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iosetbuffer.o: iosetbuffer.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iosetvbuf.o: iosetvbuf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iosprintf.o: iosprintf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iosscanf.o: iosscanf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iostrerror.o: iostrerror.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
ioungetc.o: ioungetc.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
iovfprintf.o: iovfprintf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
- $(srcdir)/iolibio.h $(srcdir)/libio.h \
+ $(srcdir)/iolibio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/floatio.h
iovfscanf.o: iovfscanf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/floatio.h
iovsprintf.o: iovsprintf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/strfile.h
iovsscanf.o: iovsscanf.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/strfile.h
outfloat.o: outfloat.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
peekc.o: peekc.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
stdfiles.o: stdfiles.c \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h \
- $(srcdir)/libio.h
+ $(srcdir)/libio.h $(_G_CONFIG_H)
strops.o: strops.c \
- $(srcdir)/strfile.h $(srcdir)/libio.h \
+ $(srcdir)/strfile.h \
+ $(srcdir)/libio.h $(_G_CONFIG_H) \
$(srcdir)/libioP.h \
- libc-lock.h \
$(srcdir)/iolibio.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
1998-10-12 3:06 ` Alexandre Oliva
@ 1998-10-12 9:14 ` Jeffrey A Law
0 siblings, 0 replies; 9+ messages in thread
From: Jeffrey A Law @ 1998-10-12 9:14 UTC (permalink / raw)
To: Alexandre Oliva; +Cc: egcs-patches, Joe Buck, egcs
In message < orsogup38k.fsf@araguaia.dcc.unicamp.br >you write:
> > libc-lock is probably created on linux systems only, and the sed script
> > probably doesn't filter it out.
>
> Correct. Fixed in the attached patch. I've checked that it runs
> correctly and produces the same results on Solaris2.5/sparc and
> GNU/Linux/x86
>
> Ok to install?
>
> --
> Alexandre Oliva
> mailto:oliva@dcc.unicamp.br mailto:oliva@gnu.org mailto:aoliva@acm.org
> http://www.dcc.unicamp.br/~oliva
> Universidade Estadual de Campinas, SP, Brasil
>
> --Multipart_Mon_Oct_12_06:56:59_1998-1
> Content-Type: application/octet-stream; type=patch
> Content-Disposition: attachment; filename="libio.diff"
> Content-Transfer-Encoding: 7bit
>
> Index: libio/ChangeLog
> from Alexandre Oliva <oliva@dcc.unicamp.br>
>
> * config.shared (depend.new): delete libc-lock.h from
> dependencies, and fix _G_config.h -> $(_G_CONFIG_H) rule
> * depend: Rebuilt.
Yes. This is fine.
Thanks!
jeff
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (2/2)
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
1998-10-12 1:06 ` Jeffrey A Law
@ 1998-10-12 16:07 ` Alexandre Oliva
1998-10-12 20:53 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (1/2) Alexandre Oliva
1998-10-14 0:54 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make Jeffrey A Law
3 siblings, 0 replies; 9+ messages in thread
From: Alexandre Oliva @ 1998-10-12 16:07 UTC (permalink / raw)
To: law; +Cc: egcs-patches, Joe Buck, egcs
-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
@@ -292,12 +270,10 @@
uninstall: uninstall-binPROGRAMS uninstall-binSCRIPTS
-all: Makefile $(PROGRAMS) $(SCRIPTS)
-
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs:
- $(mkinstalldirs) $(bindir) $(bindir)
+ $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(bindir)
mostlyclean-generic:
@@ -315,29 +291,28 @@
-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-tags mostlyclean-generic
-clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \
- clean-generic mostlyclean
+clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \
+ mostlyclean
distclean: distclean-binPROGRAMS distclean-compile distclean-tags \
- distclean-depend distclean-generic clean
+ distclean-generic clean
-rm -f config.status
maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean
+ 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-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 \
+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
--Multipart_Mon_Oct_12_11:17:35_1998-1--
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (1/2)
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
1998-10-12 1:06 ` Jeffrey A Law
1998-10-12 16:07 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (2/2) Alexandre Oliva
@ 1998-10-12 20:53 ` Alexandre Oliva
1998-10-14 0:54 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make Jeffrey A Law
3 siblings, 0 replies; 9+ messages in thread
From: Alexandre Oliva @ 1998-10-12 20:53 UTC (permalink / raw)
To: law; +Cc: egcs-patches, Joe Buck, egcs
Sender: oliva@araguaia.dcc.unicamp.br
To: law@cygnus.com
Cc: egcs-patches@cygnus.com, Joe Buck <jbuck@synopsys.com>, egcs@cygnus.com
Subject: Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
References: < 29186.908092404@hurl.cygnus.com > < orsogushx1.fsf@araguaia.dcc.unicamp.br >
From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: 12 Oct 1998 11:17:34 -200
In-Reply-To: Alexandre Oliva's message of "11 Oct 1998 23:11:38 -200"
Message-ID: <oraf31or69.fsf@araguaia.dcc.unicamp.br>
Lines: 1047
User-Agent: Gnus/5.070033 (Pterodactyl Gnus v0.33) XEmacs/20.4 (Emerald)
MIME-Version: 1.0 (generated by SEMI 1.8.6 - "Fukuoka")
Content-Type: multipart/mixed;
boundary="Multipart_Mon_Oct_12_11:17:35_1998-1"
Content-Transfer-Encoding: 7bit
--Multipart_Mon_Oct_12_11:17:35_1998-1
Content-Type: text/plain; charset=US-ASCII
Alexandre Oliva <oliva@dcc.unicamp.br> writes:
> An easy solution for this problem is to build texinfo then run, in the
> texinfo directory of the *source* tree, run:
> % automake --include-deps --build-dir=/root/of/build/tree/texinfo --gnu
Just after sending this message, I found out I should also have added
--srcdir-name=`pwd`. The resulting diffs for the Makefiles are
attached. Fell free to commit them while I'm away, or approve them
ASAP :-)
--
Alexandre Oliva
mailto:oliva@dcc.unicamp.br mailto:oliva@gnu.org mailto:aoliva@acm.org
http://www.dcc.unicamp.br/~oliva
Universidade Estadual de Campinas, SP, Brasil
--Multipart_Mon_Oct_12_11:17:35_1998-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="texinfo.diff"
Content-Transfer-Encoding: 7bit
Index: texinfo/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- texinfo/Makefile.in 1998/04/10 00:37:58 1.11
+++ texinfo/Makefile.in 1998/10/12 13:12:30
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -70,7 +72,6 @@
GT_YES = @GT_YES@
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
@@ -119,13 +120,13 @@
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 +260,6 @@
-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 +295,6 @@
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 +335,11 @@
@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 \
Index: texinfo/doc/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/doc/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- texinfo/doc/Makefile.in 1998/04/02 03:45:20 1.4
+++ texinfo/doc/Makefile.in 1998/10/12 13:12:33
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -67,7 +69,6 @@
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 @@
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 @@
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 @@
texinfo: texinfo.txi
-texinfo.txi.dvi: texinfo.txi
+texinfo.dvi: texinfo.txi
DVIPS = dvips
@@ -162,6 +163,20 @@
.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 @@
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 @@
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 @@
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 @@
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 @@
@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 \
Index: texinfo/info/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/info/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- texinfo/info/Makefile.in 1998/04/02 03:45:17 1.4
+++ texinfo/info/Makefile.in 1998/10/12 13:12:33
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -66,7 +68,6 @@
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 @@
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 @@
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 @@
maintainer-clean-noinstPROGRAMS:
+.c.o:
+ $(COMPILE) -c $<
+
.s.o:
$(COMPILE) -c $<
@@ -267,37 +264,12 @@
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 @@
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 @@
-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
Index: texinfo/lib/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/lib/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- texinfo/lib/Makefile.in 1998/04/02 03:45:22 1.4
+++ texinfo/lib/Makefile.in 1998/10/12 13:12:33
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -67,7 +69,6 @@
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 @@
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 @@
maintainer-clean-noinstLIBRARIES:
+.c.o:
+ $(COMPILE) -c $<
+
.s.o:
$(COMPILE) -c $<
@@ -199,37 +200,17 @@
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 getopt.h
+getopt1.o: getopt1.c getopt.h
+xmalloc.o: xmalloc.c
+xstrdup.o: xstrdup.c
-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 @@
uninstall:
-all: Makefile $(LIBRARIES)
-
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs:
@@ -268,30 +247,28 @@
-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
Index: texinfo/makeinfo/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/makeinfo/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- texinfo/makeinfo/Makefile.in 1998/04/02 03:45:18 1.4
+++ texinfo/makeinfo/Makefile.in 1998/10/12 13:12:34
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -67,7 +69,6 @@
GT_YES = @GT_YES@
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
@@ -123,18 +124,17 @@
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
@@ -150,20 +150,23 @@
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
+.c.o:
+ $(COMPILE) -c $<
+
.s.o:
$(COMPILE) -c $<
@@ -214,37 +217,15 @@
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 ../lib/getopt.h makeinfo.h
+multi.o: multi.c ../lib/system.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
@@ -261,12 +242,10 @@
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:
@@ -284,29 +263,28 @@
-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-tags mostlyclean-generic
-clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \
- clean-generic mostlyclean
+clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \
+ mostlyclean
distclean: distclean-binPROGRAMS distclean-compile distclean-tags \
- distclean-depend distclean-generic clean
+ distclean-generic clean
-rm -f config.status
maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean
+ 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-binPROGRAMS distclean-binPROGRAMS 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 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
Index: texinfo/util/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/util/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- texinfo/util/Makefile.in 1998/04/02 03:45:19 1.4
+++ texinfo/util/Makefile.in 1998/10/12 13:12:34
@@ -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 @@
includedir = @includedir@
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -67,7 +69,6 @@
GT_YES = @GT_YES@
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
@@ -131,18 +132,17 @@
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
@@ -158,20 +158,23 @@
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
+.c.o:
+ $(COMPILE) -c $<
+
.s.o:
$(COMPILE) -c $<
@@ -198,21 +201,21 @@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(bindir)
+ $(mkinstalldirs) $(DESTDIR)$(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)'`; \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(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)'`; \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
else :; fi; fi; \
done
uninstall-binSCRIPTS:
- $(NORMAL_UNINSTALL)
+ @$(NORMAL_UNINSTALL)
list='$(bin_SCRIPTS)'; for p in $$list; do \
- rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
tags: TAGS
@@ -245,37 +248,12 @@
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
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
` (2 preceding siblings ...)
1998-10-12 20:53 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (1/2) Alexandre Oliva
@ 1998-10-14 0:54 ` Jeffrey A Law
3 siblings, 0 replies; 9+ messages in thread
From: Jeffrey A Law @ 1998-10-14 0:54 UTC (permalink / raw)
To: Alexandre Oliva; +Cc: egcs-patches, Joe Buck, egcs
In message < orsogushx1.fsf@araguaia.dcc.unicamp.br >you write:
> This has probably happened because development Makefile.in's have been
> installed in the CVS tree.
I don't think we did that in texinfo. To the best of my knowledge we just
sucked in a release and turned off stuff we don't need/want.
> Should I commit the produced Makefile.ins?
Feel free if you're still online :-) Else it can be dealt with when you
return from traveling. This is not a time critical issue IMHO.
jeff
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~1998-10-14 0:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1998-10-09 19:52 egcs-1.1b and Solaris make Joe Buck
1998-10-11 2:41 ` Jeffrey A Law
1998-10-11 22:21 ` [solution for texinfo Makefiles] " Alexandre Oliva
1998-10-12 1:06 ` Jeffrey A Law
1998-10-12 3:06 ` Alexandre Oliva
1998-10-12 9:14 ` Jeffrey A Law
1998-10-12 16:07 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (2/2) Alexandre Oliva
1998-10-12 20:53 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make (1/2) Alexandre Oliva
1998-10-14 0:54 ` [solution for texinfo Makefiles] Re: egcs-1.1b and Solaris make Jeffrey A Law
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).