X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2FMakefile.am;h=724cb52fa5f8fee61a19f04b076794af7fa3e596;hb=refs%2Fheads%2Fmaster;hp=335f4293e9b6546ab6028da90cac34dc4a3d8280;hpb=dfae8b42d7696b7a845ae9ac8198656d288f05f3;p=netatalk.git

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 335f4293..724cb52f 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -2,12 +2,11 @@
 
 pkgconfdir = @PKGCONFDIR@
 BUILT_SOURCES =
-EXTRA_DIST =
+EXTRA_DIST = afpstats-service.xml afpstats_service_glue.h
 CLEANFILES =
 DISTCLEANFILES =
 
 sbin_PROGRAMS = afpd
-noinst_PROGRAMS = hash fce
 
 afpd_SOURCES = \
 	afp_avahi.c \
@@ -39,6 +38,7 @@ afpd_SOURCES = \
 	nfsquota.c \
 	ofork.c \
 	quota.c \
+	spotlight_marshalling.c \
 	status.c \
 	switch.c \
 	uam.c \
@@ -49,7 +49,7 @@ afpd_SOURCES = \
 
 afpd_LDADD =  \
 	$(top_builddir)/libatalk/libatalk.la \
-	@LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
+	@LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@ @MYSQL_LIBS@
 
 afpd_LDFLAGS = -export-dynamic
 
@@ -62,13 +62,18 @@ afpd_CFLAGS = \
 	-D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
 	-D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
+if HAVE_TRACKER
+afpd_SOURCES += spotlight.c
+afpd_LDADD += $(top_builddir)/etc/spotlight/libspotlight.la
+afpd_CFLAGS += @TRACKER_CFLAGS@
+endif
+
 if HAVE_ACLS
 afpd_SOURCES += acls.c
 endif
 
 if HAVE_DBUS_GLIB
 BUILT_SOURCES += afpstats_service_glue.h
-EXTRA_DIST += afpstats-service.xml
 DISTCLEANFILES += afpstats_service_glue.h
 
 afpstats_service_glue.h: afpstats-service.xml
@@ -80,8 +85,8 @@ afpstats_service_glue.h: afpstats-service.xml
 			$(top_srcdir)/etc/afpd/afpstats-service.xml
 
 afpd_SOURCES += afpstats.c afpstats_obj.c
-afpd_CFLAGS  += $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION
-afpd_LDFLAGS += $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -ldbus-glib-1
+afpd_CFLAGS  += $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GTHREAD_CFLAGS) -DDBUS_COMPILATION
+afpd_LDFLAGS += $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(DBUS_GTHREAD_LIBS) -ldbus-glib-1
 endif
 
 if WITH_DTRACE
@@ -97,10 +102,3 @@ noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h fi
 	 filedir.h fork.h icon.h mangle.h misc.h status.h switch.h \
 	 uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h \
 	 dircache.h afp_zeroconf.h afp_avahi.h afp_mdns.h afpstats.h afpstats_obj.h
-
-hash_SOURCES = hash.c
-hash_CFLAGS = -DKAZLIB_TEST_MAIN -I$(top_srcdir)/include
-
-fce_SOURCES = fce_api.c fce_util.c
-fce_CFLAGS = -DFCE_TEST_MAIN -I$(top_srcdir)/include
-fce_LDADD = $(top_builddir)/libatalk/libatalk.la