fix ansi2knr

diff --git a/automake.in b/automake.in
index 7b427da..a0ff023 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -86,22 +86,26 @@ do
     cat $AM_DIR/compile.am >&5
     for am_file in $PROGRAMS $LIBRARIES; do
       if grep "^[       ]*${am_file}_SOURCES[   ]*=" ${am_makefile}.am >/dev/null; then
-        sed -n -f $am_rmnl ${am_makefile}.am |
-        sed -n "/^[     ]*${am_file}_SOURCES[   ]*=/{
+        if grep "^[     ]*${am_file}_OBJECTS[   ]*=" ${am_makefile}.am >/dev/null; then
+          :
+        else
+          sed -n -f $am_rmnl ${am_makefile}.am |
+          sed -n "/^[   ]*${am_file}_SOURCES[   ]*=/{
 s/SOURCES/OBJECTS/
 s/@[^@]*@//g
 s/\$([^)]*)//g
 s/\${[^}]*}//g
-s/\\.cc/.o/g
-s/\\.\${kr}c/.o/g
-s/\\.\$(kr)c/.o/g
-s/\\.[cCmylfs]/.o/g
+s/\\.cc/.\${kr}o/g
+s/\\.\${kr}c/.\${kr}o/g
+s/\\.\$(kr)c/.\${kr}o/g
+s/\\.[cCmylfs]/.\${kr}o/g
 p
 }" >&4
+        fi
         SOURCES="$SOURCES \${${am_file}_SOURCES}"
       else
         echo "${am_file}_SOURCES = ${am_file}.c
-${am_file}_OBJECTS = ${am_file}.o" >&4
+${am_file}_OBJECTS = ${am_file}.\${kr}o" >&4
         SOURCES="$SOURCES ${am_file}.c"
       fi
       if test -n "$CONFIG_HEADER"; then

diff --git a/compile.am b/compile.am
index 8da8ab5..c1c25b1 100644 (file)
--- a/compile.am
+++ b/compile.am
@@ -1,7 +1,12 @@
-.SUFFIXES: .c .o .krc .krh
+.SUFFIXES: .c .o .krc .krh .kro
 .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) $< > $@
 

diff --git a/footer.am b/footer.am
index 65bf462..fb36f76 100644 (file)
--- a/footer.am
+++ b/footer.am
@@ -1,4 +1,4 @@
-check::
+check dvi info install uninstall::
 
 tags:: TAGS
 

diff --git a/lib/am/compile.am b/lib/am/compile.am
index 8da8ab5..c1c25b1 100644 (file)
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,7 +1,12 @@
-.SUFFIXES: .c .o .krc .krh
+.SUFFIXES: .c .o .krc .krh .kro
 .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) $< > $@
 

diff --git a/lib/am/footer.am b/lib/am/footer.am
index 65bf462..fb36f76 100644 (file)
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,4 +1,4 @@
-check::
+check dvi info install uninstall::
 
 tags:: TAGS
 

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7c2ea85..4fa3236 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,13 +1,14 @@
 .SUFFIXES: .texi .info .dvi
+
 .texi.info:
        $(MAKEINFO) $<
 
 .texi.dvi:
        $(TEXI2DVI) $<
 
-info: $(INFOS)
+info:: $(INFOS)
 
-dvi: $(DVIS)
+dvi:: $(DVIS)
 
 install:: install-info
 

diff --git a/texinfos.am b/texinfos.am
index 7c2ea85..4fa3236 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -1,13 +1,14 @@
 .SUFFIXES: .texi .info .dvi
+
 .texi.info:
        $(MAKEINFO) $<
 
 .texi.dvi:
        $(TEXI2DVI) $<
 
-info: $(INFOS)
+info:: $(INFOS)
 
-dvi: $(DVIS)
+dvi:: $(DVIS)
 
 install:: install-info