test: Add Makefile.am to test/testprogs

This way it's an individual subdirectory and things go easier.

diff --git a/configure.ac b/configure.ac
index c0a095e..c01ff67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,5 +23,6 @@ AC_CONFIG_FILES([
         doc/Makefile
         src/Makefile
         test/Makefile
+        test/testprogs/Makefile
 ])
 AC_OUTPUT

diff --git a/test/Makefile.am b/test/Makefile.am
index eedf8de..ce169ae 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
-check_PROGRAMS = \
-       loadf_dumpf loads_dumps load_file_dump_file \
-       testprogs/test_array testprogs/test_number testprogs/test_object
+SUBDIRS = testprogs
+
+check_PROGRAMS = loadf_dumpf loads_dumps load_file_dump_file
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 AM_CFLAGS = -Wall -Werror

diff --git a/test/testprogs/Makefile.am b/test/testprogs/Makefile.am
new file mode 100644 (file)
index 0000000..b7b7e91
--- /dev/null
+++ b/test/testprogs/Makefile.am
@@ -0,0 +1,10 @@
+check_PROGRAMS = test_array test_number test_object
+
+test_array_SOURCES = test_array.c util.h
+test_number_SOURCES = test_number.c util.h
+test_object_SOURCES = test_number.c util.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CFLAGS = -Wall -Werror
+LDFLAGS = -static  # for speed and Valgrind
+LDADD = ../../src/libjansson.la