-SUBDIRS = dummy lua memcpy notify testsuite playlist osd xml probe
-SOURCES_gtk_main = gtk_main.c
-SOURCES_gnome_main = gtk_main.c
-SOURCES_gtk2_main = gtk_main.c
-SOURCES_gnome2_main = gtk_main.c
-SOURCES_screensaver = screensaver.c
-SOURCES_qte_main = qte_main.cpp
-SOURCES_freetype = freetype.c
+BASE_SUBDIRS = dummy notify playlist stats osd xml
+EXTRA_SUBDIRS = lua
+
+SUBDIRS = $(BASE_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+
+if BUILD_LUA
+SUBDIRS += lua
+endif
+
+SOURCES_freetype = freetype.c text_renderer.h