Fix build deps

diff --git a/Makefile.am b/Makefile.am
index 813c8cc7e1632b86f713941b4cdd51be2123d5b5..646503575ec6d7253d5e31fa56abe4a6d7b0f214 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile.am for top level of netatalk package
 
-SUBDIRS = libatalk libevent bin config etc man contrib distrib include sys doc macros test
+# libevent should be first
+SUBDIRS = libevent libatalk bin config etc man contrib distrib include sys doc macros test
 
 EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION services.atalk
 

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index 5cf561d9dfc9339e3f79eb3487bc752f63411cb9..5e95bfcb3ca8577d9acf62cf5bfab0bbcc33c3a8 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 rpc talloc tdb tevent tsocket util unicode vfs
+# rpc should be first because it generates RPC headers included elsewhere
+SUBDIRS = rpc acl adouble bstring compat cnid dsi tdb util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
@@ -14,10 +15,7 @@ libatalk_la_LIBADD  = \
        compat/libcompat.la     \
        dsi/libdsi.la           \
        rpc/librpc.la           \
-       talloc/libtalloc.la \
        tdb/libtdb.la       \
-       tevent/libtevent.la \
-       tsocket/libtsocket.la \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la           \
@@ -30,10 +28,7 @@ libatalk_la_DEPENDENCIES = \
        compat/libcompat.la     \
        dsi/libdsi.la           \
        rpc/librpc.la           \
-       talloc/libtalloc.la \
        tdb/libtdb.la       \
-       tevent/libtevent.la \
-       tsocket/libtsocket.la \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la           \

diff --git a/libevent/Makefile.am b/libevent/Makefile.am
index 9a572d21f55679d212566b8dd519477102709b65..dda19b22096aca57523c13289ba4d8110aeaac6b 100644 (file)
--- a/libevent/Makefile.am
+++ b/libevent/Makefile.am
@@ -173,7 +173,7 @@ NO_UNDEFINED =
 MAYBE_CORE =
 endif
 
-GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED)
+GENERIC_LDFLAGS = -static
 
 libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)