diff options
| -rw-r--r-- | README | 10 | ||||
| -rwxr-xr-x | automake.in | 6 | ||||
| -rw-r--r-- | compile.am | 16 | ||||
| -rw-r--r-- | header-vars.am | 2 | ||||
| -rw-r--r-- | lib/am/compile.am | 16 | ||||
| -rw-r--r-- | lib/am/header-vars.am | 2 |
6 files changed, 37 insertions, 15 deletions
@@ -3,7 +3,7 @@ by the 4.4BSD make and include files, but aims to be portable and to conform to the GNU standards for Makefile variables and targets. automake is a shell script. The input files are called Makefile.am. -The output files are called Makefile.in; they are suitable for use +The output files are called Makefile.in; they are intended for use with Autoconf. Variable assignment lines in Makefile.am pull in defaults from various @@ -15,5 +15,13 @@ and the examples provided for GNU m4 1.3 and fileutils 3.9 (along with patches you need to apply to those packages) and time 1.6. AutoMake is just a prototype at this point -- expect omissions and bugs. +It uses only the programs that the GNU coding standards allow in +configure scripts, because I wrote it keeping in mind the possibility +of it becoming an Autoconf macro, so it would run at configure-time. +That would slow configuration down a bit, but allow users to modify +the Makefile.am without needing to fetch the AutoMake package. And, +the Makefile.in files wouldn't need to be distributed. But all of +AutoMake would. So I might reimplement AutoMake in Perl, m4, or some +other more appropriate language. - David MacKenzie <djm@gnu.ai.mit.edu> diff --git a/automake.in b/automake.in index d5e18468d..123e3e057 100755 --- a/automake.in +++ b/automake.in @@ -177,11 +177,13 @@ ${am_file}_OBJECTS = ${am_file}.\${kr}o" >&4 cat $AM_DIR/footer.am >&5 - sed '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$d' ${am_makefile}.am >> ${am_makefile}.vars - sed -n '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$p' ${am_makefile}.am >> ${am_makefile}.rules + sed '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$d' ${am_makefile}.am >&4 + sed -n '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$p' ${am_makefile}.am >&5 cat ${am_makefile}.vars ${am_makefile}.rules > ${am_makefile}.in rm -f ${am_makefile}.vars ${am_makefile}.rules done +rm -f $am_rmnl $am_ass + exit $am_status diff --git a/compile.am b/compile.am index aeb40bfab..f1f7c2705 100644 --- a/compile.am +++ b/compile.am @@ -2,14 +2,20 @@ .c.o: $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -.krc.kro: - cp $< krtmp$$.c && \ - $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ - mv krtmp$$.o $@ - .c.krc: $(ANSI2KNR) $< > $@ .h.krh: $(ANSI2KNR) $< > $@ +.krc.kro: + cp $< krtmp$$.c && \ + $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ + mv krtmp$$.o $@ + +.c.kro: + $(ANSI2KNR) $< > $*.krc + cp $*.krc krtmp$$.c && \ + $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ + mv krtmp$$.o $@ + diff --git a/header-vars.am b/header-vars.am index dec5f446a..97e68a5f6 100644 --- a/header-vars.am +++ b/header-vars.am @@ -1,4 +1,4 @@ -# Makefile generated automatically by automake from Makefile.am. +# Makefile.in generated automatically by automake from Makefile.am. # Copyright (C) 1994 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify diff --git a/lib/am/compile.am b/lib/am/compile.am index aeb40bfab..f1f7c2705 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -2,14 +2,20 @@ .c.o: $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -.krc.kro: - cp $< krtmp$$.c && \ - $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ - mv krtmp$$.o $@ - .c.krc: $(ANSI2KNR) $< > $@ .h.krh: $(ANSI2KNR) $< > $@ +.krc.kro: + cp $< krtmp$$.c && \ + $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ + mv krtmp$$.o $@ + +.c.kro: + $(ANSI2KNR) $< > $*.krc + cp $*.krc krtmp$$.c && \ + $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) krtmp$$.c && \ + mv krtmp$$.o $@ + diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index dec5f446a..97e68a5f6 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -1,4 +1,4 @@ -# Makefile generated automatically by automake from Makefile.am. +# Makefile.in generated automatically by automake from Makefile.am. # Copyright (C) 1994 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify |