*** empty log message ***

Rev: src/Makefile.am.in:1.2
Rev: src/make_am:1.2
Rev: src/symmetric/.cvsignore:1.4
Rev: src/symmetric/include/.cvsignore:1.1

src/Makefile.am.in

@@ -8,12 +8,21 @@ SUBDIRS = lib include
 
 # To remake all Makefile.am-files, run
 #
-# 	./used_headers . $(SUBDIRS) | ./make_am
+# 	./make_am
 #
 # You should run this after recompiling, but before making a dist, as
 # it uses dependency information to figure out which header files
 # should be included in th dist. How to tell this to make?
 
+Makefile.am: Makefile.am.in
+	./make_am
+
+lib/Makefile.am: lib/Makefile.am.in
+	./make_am
+
+include/Makefile.am: include/Makefile.am.in
+	./make_am
+
 bin_PROGRAMS = lsh lshd
 
 # Don't use BUILT_SOURCES, as all these files are #included, and can't be
@@ -37,14 +46,14 @@ lshd_SOURCES = $(common_sources) lshd.c reaper.c server.c server_keyexchange.c \
 	server_password.c server_userauth.c
 
 atoms_defines.h: atoms.in process_atoms
-	bash process_atoms header <atoms.in >atoms_defines.h
+	bash $(srcdir)/process_atoms header <$(srcdir)/atoms.in >$@
 
-atoms_gperf.c: atoms.in process_atoms Makefile
-	bash process_atoms gperf <atoms.in \
-             | gperf -t -c -l -k1,7,$$ -N gperf_atom >atoms_gperf.c
+atoms_gperf.c: atoms.in process_atoms
+	bash $(srcdir)/process_atoms gperf <$(srcdir)/atoms.in \
+             | gperf -t -c -l -k1,7,$$ -N gperf_atom >$@
 
 atoms_table.c: atoms.in process_atoms
-	bash process_atoms table <atoms.in >atoms_table.c
+	bash $(srcdir)/process_atoms table <$(srcdir)/atoms.in >$@
 
 LDADD = @LIBOBJS@ lib/libsymmetric.a
 
@@ -56,5 +65,5 @@ symmetric:
 	(cd lib && $(MAKE) libsymmetric.a)
 
 EXTRA_DIST = atoms.in process_atoms $(generated_sources) HACKING \
-	$(cvs_headers)
+	$(cvs_headers) Makefile.am.in
 

src/make_am

@@ -65,8 +65,13 @@ while true; do
     get_header;
     case $keyword in
 	CVS_HEADERS)
+	    # automake expands "foo \\\n\nbar" -> "foo \\\nbar". So
+	    # put all the files on one line, for simplicity.  
+	    
+	    # comm -12 - <(./cvs_headers $dir) | sed 's/\$/ \\\\/';
+
 	    add_command "(echo $args=\\\\;
-	    comm -12 - <(./cvs_headers $dir) | sed 's/\$/ \\\\/';
+	    comm -12 - <(./cvs_headers $dir) | tr '\\n' ' ';
 	    echo) 1>&4"
 	    ;;
 	SUBDIRS)
@@ -78,9 +83,10 @@ while true; do
 	    ;;
 	BODY)
 	    if [ $top = yes ]; then
-		exec <(./used_headers . $subdirs)
-	    fi
-	    run_commands && cat <&3 >&4
+		./used_headers . $subdirs | run_commands
+	    else
+		run_commands
+	    fi && cat <&3 >&4
 	    exit 0
 	    ;;
 	*)

src/symmetric/.cvsignore

 *.d
 .deps
 Makefile
+Makefile.am
+Makefile.in
 config.cache
 config.h.in
 config.log

src/symmetric/.gitignore

 /*.d
 /.deps
 /Makefile
+/Makefile.am
+/Makefile.in
 /config.cache
 /config.h.in
 /config.log

src/symmetric/include/.cvsignore

+Makefile.am

src/symmetric/include/.gitignore

+/Makefile.am