-DIST_SUBDIRS = macosx hildon minimal_macosx qt4 skins2 macosx_dialog_provider
+DIST_SUBDIRS = macosx minimal_macosx qt4 skins2 macosx_dialog_provider
SUBDIRS =
-if HAVE_DARWIN
-SUBDIRS += macosx minimal_macosx macosx_dialog_provider
+if ENABLE_MACOSX_UI
+SUBDIRS += macosx
endif
-if BUILD_HILDON
-SUBDIRS += hildon
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += macosx_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += minimal_macosx
endif
if ENABLE_QT4
SUBDIRS += qt4
endif
SOURCES_ncurses = ncurses.c
-SOURCES_fbosd = fbosd.c
+EXTRA_DIST += eject.c