Merge from branch-2-1

[netatalk.git] / contrib / Makefile.am

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 9daa32f5ebe067dfe15c47a78325cb0a3362436a..799369aec0960bc19be791cc0d3e792dca9f69a2 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,11 +1,17 @@
 # Makefile.am for contrib/
 
+SUBDIRS = macusers shell_utils
+
 if COMPILE_TIMELORD
-TIMELORD = timelord
-else
-TIMELORD =
+SUBDIRS += timelord
+endif
+
+if COMPILE_A2BOOT
+SUBDIRS += a2boot
 endif
 
-SUBDIRS = nu printing shell_utils ${TIMELORD}
+if USE_APPLETALK
+SUBDIRS += printing
+endif
 
 EXTRA_DIST = ICDumpSuffixMap