Check for empty EA slots and fix log messag missing parameter

[netatalk.git] / libatalk / Makefile.am

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index d09688212a5ad1ad45e051a5844c425b1be180a0..a241d94cd7c43e88c8ce78511d266e523c3621da 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -1,12 +1,46 @@
+
 # Makefile.am for libatalk/
 
-SUBDIRS = adouble asp atp compat dsi nbp netddp util
+SUBDIRS = acl adouble bstring compat cnid dsi tdb util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
-LIBATALK_DEPS = asp/libasp.la atp/libatp.la nbp/libnbp.la adouble/libadouble.la dsi/libdsi.la util/libutil.la compat/libcompat.la netddp/libnetddp.la asp/libasp.la
-
 libatalk_la_SOURCES = dummy.c
-libatalk_la_LIBADD  = ${LIBATALK_DEPS}
+
+libatalk_la_LIBADD  = \
+       acl/libacl.la \
+       adouble/libadouble.la   \
+       bstring/libbstring.la \
+       compat/libcompat.la     \
+       dsi/libdsi.la           \
+       util/libutil.la         \
+       tdb/libtdb.la       \
+       unicode/libunicode.la \
+       vfs/libvfs.la
+
+libatalk_la_DEPENDENCIES = \
+       acl/libacl.la \
+       adouble/libadouble.la   \
+       bstring/libbstring.la \
+       compat/libcompat.la     \
+       dsi/libdsi.la           \
+       util/libutil.la         \
+       tdb/libtdb.la       \
+       unicode/libunicode.la \
+       vfs/libvfs.la
+
 libatalk_la_LDFLAGS = -static
 
+if USE_APPLETALK
+SUBDIRS +=  asp atp nbp netddp
+libatalk_la_LIBADD += \
+       asp/libasp.la           \
+       atp/libatp.la           \
+       nbp/libnbp.la           \
+       netddp/libnetddp.la
+libatalk_la_DEPENDENCIES += \
+       asp/libasp.la           \
+       atp/libatp.la           \
+       nbp/libnbp.la           \
+       netddp/libnetddp.la
+endif