diff --git a/Makefile.am b/Makefile.am
index bac022edbb6935534f414c0e56d3e5b393a19e3b..d77e1b88334542533fb35d39c7fa54d2d9dc7dd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-SUBDIRS = src interfaces examples examples/pio tests
-if ENABLE_CDI_APP
-SUBDIRS += app
-endif
+SUBDIRS = src interfaces app examples examples/pio tests
 #
 EXTRA_DIST=config/default \
 	doc/cdi_cman.pdf \
diff --git a/app/Makefile.am b/app/Makefile.am
index e84109b2c6b3e3cf377596a1eea8f48ae9e8e2d9..d1ac609117afb73965736d8cdb9e81cafc4c5f7a 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -2,13 +2,18 @@
 #
 bin_PROGRAMS    =
 noinst_PROGRAMS =
+check_PROGRAMS  =
+if ENABLE_CDI_APP
 if ENABLE_CDI_LIB
-  bin_PROGRAMS    += cdi
-else
-  noinst_PROGRAMS += cdi
-endif
+bin_PROGRAMS += cdi
+else !ENABLE_CDI_LIB
+noinst_PROGRAMS += cdi
+endif !ENABLE_CDI_LIB
+noinst_PROGRAMS += createtable
+else !ENABLE_CDI_APP
+check_PROGRAMS += cdi
+endif !ENABLE_CDI_APP
 #
-noinst_PROGRAMS    += createtable
 #
 cdi_SOURCES         = cdi.c printinfo.c printinfo.h
 cdi_LDADD           = $(top_builddir)/src/libcdi.la @LIBS@