autogen after Makefile.am changes

libnpfs/Makefile.in

@@ -62,7 +62,7 @@ libnpfs_a_AR = $(AR) $(ARFLAGS)
 libnpfs_a_LIBADD =
 am__libnpfs_a_SOURCES_DIST = conn.c error.c fcall.c fdtrans.c \
 	fidpool.c fmt.c np.c srv.c trans.c user.c npstring.c npfs.h \
-	npfsimpl.h 9p.h ctl.c rdmatrans.c
+	npfsimpl.h 9p.h ctl.c xpthread.h rdmatrans.c
 @RDMATRANS_TRUE@am__objects_1 = rdmatrans.$(OBJEXT)
 am_libnpfs_a_OBJECTS = conn.$(OBJEXT) error.$(OBJEXT) fcall.$(OBJEXT) \
 	fdtrans.$(OBJEXT) fidpool.$(OBJEXT) fmt.$(OBJEXT) np.$(OBJEXT) \
@@ -219,7 +219,7 @@ AM_CPPFLAGS =
 noinst_LIBRARIES = libnpfs.a
 libnpfs_a_SOURCES = conn.c error.c fcall.c fdtrans.c fidpool.c fmt.c \
 	np.c srv.c trans.c user.c npstring.c npfs.h npfsimpl.h 9p.h \
-	ctl.c $(am__append_1)
+	ctl.c xpthread.h $(am__append_1)
 all: all-am
 
 .SUFFIXES:

tests/kern/dbench/Makefile.in

@@ -56,7 +56,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am_dbench_OBJECTS = fileio.$(OBJEXT) util.$(OBJEXT) dbench.$(OBJEXT) \
 	child.$(OBJEXT) system.$(OBJEXT) snprintf.$(OBJEXT)
-dbench_OBJECTS = $(am_dbench_OBJECTS)
+nodist_dbench_OBJECTS =
+dbench_OBJECTS = $(am_dbench_OBJECTS) $(nodist_dbench_OBJECTS)
 dbench_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 dbench_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -68,7 +69,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(dbench_SOURCES)
+SOURCES = $(dbench_SOURCES) $(nodist_dbench_SOURCES)
 DIST_SOURCES = $(dbench_SOURCES)
 ETAGS = etags
 CTAGS = ctags
@@ -219,8 +220,14 @@ dbench_SOURCES = \
 	snprintf.c \
 	dbench.h
 
+nodist_dbench_SOURCES = \
+	proto.h
+
+BUILT_SOURCES = proto.h
 CLEANFILES = proto.h
-all: all-am
+EXTRA_DIST = mkproto.pl
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
@@ -372,10 +379,12 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -401,6 +410,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
@@ -470,7 +480,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: check-am install-am install-strip
+.MAKE: all check check-am install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic ctags distclean \

utils/Makefile.in

@@ -273,7 +273,7 @@ diodmount_SOURCES = diodmount.c $(common_sources)
 diodcat_LDADD = $(common_ldadd)
 diodcat_SOURCES = diodcat.c $(common_sources)
 dtop_LDADD = $(common_ldadd)
-dtop_SOURCES = dtop.c sample.c
+dtop_SOURCES = dtop.c sample.c sample.h
 diodload_LDADD = $(common_ldadd)
 diodload_SOURCES = diodload.c $(common_sources)
 man8_MANS = \