Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / etc / afpd / Makefile.am

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 1612344a5132232ba3b06262d6e31c4762022f39..8cfe75a4f94efbdfb3c1055067f7dc8daf330643 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -2,12 +2,12 @@
 
 pkgconfdir = @PKGCONFDIR@
 BUILT_SOURCES =
-EXTRA_DIST =
+EXTRA_DIST = afpstats-service.xml afpstats_service_glue.h
 CLEANFILES =
 DISTCLEANFILES =
 
 sbin_PROGRAMS = afpd
-noinst_PROGRAMS = hash fce
+noinst_PROGRAMS = hash fce spot
 
 afpd_SOURCES = \
        afp_avahi.c \
@@ -39,6 +39,8 @@ afpd_SOURCES = \
        nfsquota.c \
        ofork.c \
        quota.c \
+       spotlight.c \
+       spotlight_marshalling.c \
        status.c \
        switch.c \
        uam.c \
@@ -46,6 +48,7 @@ afpd_SOURCES = \
        unix.c \
        volume.c
 
+
 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@
@@ -67,7 +70,6 @@ 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
@@ -79,8 +81,17 @@ 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
+DTRACE_OBJ = afpd-afp_dsi.o afpd-fork.o afpd-appl.o afpd-catsearch.o afpd-directory.o afpd-enumerate.o afpd-file.o afpd-filedir.o
+afp_dtrace.o: $(top_srcdir)/include/atalk/afp_dtrace.d $(DTRACE_OBJ)
+       if test -f afp_dtrace.o ; then rm -f afp_dtrace.o ; fi
+       $(LIBTOOL) --mode=execute dtrace -G -s $(top_srcdir)/include/atalk/afp_dtrace.d -o afp_dtrace.o $(DTRACE_OBJ)
+afpd_LDADD += afp_dtrace.o @DTRACE_LIBS@
+CLEANFILES += afp_dtrace.o
 endif
 
 noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h file.h \
@@ -94,3 +105,7 @@ 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
+
+spot_SOURCES = spotlight.c spotlight_marshalling.c
+spot_CFLAGS = -DSPOT_TEST_MAIN
+spot_LDADD = $(top_builddir)/libatalk/libatalk.la