X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2FMakefile.am;h=1612344a5132232ba3b06262d6e31c4762022f39;hb=22ad101eb72bf10fe5144526209798c677b2d1d8;hp=dd81a3f7e854021e52bb0ea8cb0c32e22ff53e1d;hpb=5825df1c826101269dccd558ac9ac85c0dcd4e36;p=netatalk.git

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index dd81a3f7..1612344a 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -1,15 +1,19 @@
 # Makefile.am for etc/afpd/
 
 pkgconfdir = @PKGCONFDIR@
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
+DISTCLEANFILES =
 
 sbin_PROGRAMS = afpd
-noinst_PROGRAMS = hash
+noinst_PROGRAMS = hash fce
 
 afpd_SOURCES = \
-	afp_asp.c \
 	afp_avahi.c \
 	afp_config.c \
 	afp_dsi.c \
+	afp_mdns.c \
 	afp_options.c \
 	afp_util.c \
 	afp_zeroconf.c \
@@ -23,10 +27,11 @@ afpd_SOURCES = \
 	directory.c \
 	enumerate.c \
 	extattrs.c \
+	fce_api.c \
+	fce_util.c \
 	file.c \
 	filedir.c \
 	fork.c \
-	gettok.c \
 	hash.c \
 	main.c \
 	mangle.c \
@@ -42,36 +47,50 @@ afpd_SOURCES = \
 	volume.c
 
 afpd_LDADD =  \
-	$(top_builddir)/libatalk/cnid/libcnid.la \
 	$(top_builddir)/libatalk/libatalk.la \
-	@LIBGCRYPT_LIBS@ @ZEROCONF_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@
+	@LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
 
-afpd_LDFLAGS = -export-dynamic 
+afpd_LDFLAGS = -export-dynamic
 
 afpd_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/sys \
-	@SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
+	@ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @PTHREAD_CFLAGS@\
 	-DAPPLCNAME \
 	-DSERVERTEXT=\"$(SERVERTEXT)/\" \
-	-D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
-	-D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
 	-D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
-	-D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \
-	-D_PATH_AFPDSIGCONF=\"$(pkgconfdir)/afp_signature.conf\" \
 	-D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-	-D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" \
-	-D_PATH_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\"
+	-D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
+	-D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
 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
 
-noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
-	 filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
+afpstats_service_glue.h: afpstats-service.xml
+	$(LIBTOOL) --mode=execute \
+		dbus-binding-tool \
+			--prefix=afpstats_obj \
+			--mode=glib-server \
+			--output=afpstats_service_glue.h \
+			$(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
+endif
+
+noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h file.h \
+	 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
+	 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