r337: Check multi-file export in 'make check', too; and tell automake that we have...

[nbd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 19893e2..d909a2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,9 @@
 bin_PROGRAMS = nbd-server
 EXTRA_PROGRAMS = nbd-client knbd-client
-TESTS = $(srcdir)/simple_test
+TESTS_ENVIRONMENT=$(srcdir)/simple_test
+TESTS = cmd cfg1 cfgmulti
 check_PROGRAMS = nbd-tester-client
+knbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h
 nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h
@@ -23,8 +25,6 @@ nbd-server.5.in: nbd-server.5.sgml
        mv NBD-SERVER.5 nbd-server.5.in
 dist-hook:
        rm -Rf `find $(distdir) -name '.svn' -type d -print`
-knbd_client-nbd-client.o: nbd-client.c
-       $(KLCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(knbd_client_CPPFLAGS) $(CPPFLAGS) $(knbd_client_CFLAGS) $(CFLAGS) -c -o knbd_client-nbd-client.o nbd-client.c
-knbd-client$(EXEEXT): knbd_client-nbd-client.o $(knbd_client_DEPENDENCIES)
-       @rm -f knbd-client$(EXEEXT)
-       $(LINK) $(knbd_client_LDFLAGS) knbd_client-nbd-client.o $(knbd_client_LDADD) $(LIBS)
+cmd:
+cfg1:
+cfgmulti: