Merge from branch-2-1

[netatalk.git] / contrib / Makefile.am

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a7fe893233a407a1d909ccb237ae236b53ed8b64..5652b1bb74d2ad283927a2c398cc40cba3b43da9 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,12 +1,15 @@
 # Makefile.am for contrib/
-# $Id: Makefile.am,v 1.8 2003-06-08 15:21:40 srittau Exp $
 
-if COMPILE_A2BOOT
-A2BOOT = a2boot
-else
-A2BOOT =
+SUBDIRS = macusers shell_utils
+
+if COMPILE_TIMELORD
+SUBDIRS += timelord
 endif
 
-SUBDIRS = macusers nu printing shell_utils timelord ${A2BOOT}
+if COMPILE_A2BOOT
+SUBDIRS += a2boot
+endif
 
-EXTRA_DIST = ICDumpSuffixMap
+if USE_APPLETALK
+SUBDIRS += printing
+endif