Merge from branch-2-1

[netatalk.git] / libatalk / Makefile.am

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