more intuitive parameter

[netatalk.git] / libatalk / Makefile.am

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index ab44b3d6ef39437b79ae049892b3209198f37f20..4956930e88ee7f0ed4414a6095d3c1d37e987809 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -1,21 +1,24 @@
 
 # Makefile.am for libatalk/
 
-SUBDIRS = acl adouble bstring compat cnid dsi talloc tdb util unicode vfs
+# rpc should be first because it generates RPC headers included elsewhere
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
 libatalk_la_SOURCES = dummy.c
 
 libatalk_la_LIBADD  = \
+       @WRAP_LIBS@ @ACL_LIBS@ \
        acl/libacl.la \
        adouble/libadouble.la   \
        bstring/libbstring.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
-       util/libutil.la         \
+       iniparser/libiniparser.la \
        tdb/libtdb.la       \
        unicode/libunicode.la \
+       util/libutil.la         \
        vfs/libvfs.la
 
 libatalk_la_DEPENDENCIES = \
@@ -24,23 +27,10 @@ libatalk_la_DEPENDENCIES = \
        bstring/libbstring.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
-       util/libutil.la         \
+       iniparser/libiniparser.la \
        tdb/libtdb.la       \
        unicode/libunicode.la \
+       util/libutil.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
+libatalk_la_LDFLAGS = -version-info 0:0:0