diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 2c76b56a..880602e0 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -16,12 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-SUBDIRS =
-
-if ENABLE_PYTHON
-SUBDIRS += python
-endif
-
-if ENABLE_VALA
-SUBDIRS += vala
-endif
+SUBDIRS = python vala
diff --git a/bindings/python/eekboard/Makefile.am b/bindings/python/eekboard/Makefile.am
index e64dc4f0..219471e0 100644
--- a/bindings/python/eekboard/Makefile.am
+++ b/bindings/python/eekboard/Makefile.am
@@ -15,6 +15,7 @@
 # along with this program.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+if ENABLE_PYTHON
 pkgpython_PYTHON =				\
 	__init__.py				\
 	serializable.py				\
@@ -23,3 +24,4 @@ pkgpython_PYTHON =				\
 	text.py					\
 	client.py				\
 	context.py
+endif
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 436dd3a7..39c81843 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+if ENABLE_VALA
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
 	eek-$(EEK_API_VERSION).vapi \
@@ -72,3 +73,5 @@ eekboard-$(EEK_API_VERSION).vapi:
 VAPIGEN_V = $(VAPIGEN_V_$(V))
 VAPIGEN_V_ = $(VAPIGEN_V_$(AM_DEFAULT_VERBOSITY))
 VAPIGEN_V_0 = @echo "  VAPIG " $@;
+endif
+