Merge master

[netatalk.git] / libatalk / Makefile.am

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index a70237318ff84c457c5cf8dbae43b39c12123a4a..76d940767642cff103f561d97d1450f8512fa8c9 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -1,7 +1,8 @@
 
 # Makefile.am for libatalk/
 
-SUBDIRS = acl adouble bstring compat cnid dsi tdb util unicode vfs
+# rpc should be first because it generates RPC headers included elsewhere
+SUBDIRS = rpc acl adouble bstring compat cnid dsi locking tdb util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
@@ -13,10 +14,13 @@ libatalk_la_LIBADD  = \
        bstring/libbstring.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
-       util/libutil.la         \
+       locking/liblocking.la           \
+       rpc/librpc.la           \
        tdb/libtdb.la       \
        unicode/libunicode.la \
-       vfs/libvfs.la
+       util/libutil.la         \
+       vfs/libvfs.la           \
+       $(top_builddir)/libevent/libevent.la
 
 libatalk_la_DEPENDENCIES = \
        acl/libacl.la \
@@ -24,23 +28,12 @@ libatalk_la_DEPENDENCIES = \
        bstring/libbstring.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
-       util/libutil.la         \
+       locking/liblocking.la           \
+       rpc/librpc.la           \
        tdb/libtdb.la       \
        unicode/libunicode.la \
-       vfs/libvfs.la
+       util/libutil.la         \
+       vfs/libvfs.la           \
+       $(top_builddir)/libevent/libevent.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