Merge master

[netatalk.git] / man / man1 / Makefile.am

diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index 9ccb204f0f4ff4392860edee546e5249f0893649..15371dba4abe3d969160d4ce9703e8351484ab86 100644 (file)
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -12,25 +12,16 @@ SUFFIXES= .tmpl .
            -e s@:DEFAULT_CNID_SCHEME:@${DEFAULT_CNID_SCHEME}@ \
            <$< >$@
 
-GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 uniconv.1 asip-status.pl.1
-TEMPLATE_FILES = apple_cp.1.tmpl apple_mv.1.tmpl apple_rm.1.tmpl uniconv.1.tmpl asip-status.pl.1.tmpl
-NONGENERATED_MANS      =       achfile.1  \
-                               ad.1 \
-                               afile.1 \
+GENERATED_MANS = uniconv.1 asip-status.pl.1
+TEMPLATE_FILES = uniconv.1.tmpl asip-status.pl.1.tmpl
+
+NONGENERATED_MANS      =       ad.1 \
                                afppasswd.1 \
                                apple_dump.1 \
                                dbd.1 \
-                               hqx2bin.1 \
-                               macbinary.1 \
-                               megatron.1 \
-                               netatalk-config.1 \
-                               single2bin.1 \
-                               unbin.1 \
-                               unhex.1 \
-                               unsingle.1
+                               netatalk-config.1
 
-if USE_APPLETALK
-NONGENERATED_MANS += aecho.1 \
+ATALK_MANS = aecho.1 \
                                getzones.1 \
                                nbp.1 \
                                nbplkup.1 \
@@ -39,11 +30,11 @@ NONGENERATED_MANS += aecho.1 \
                                pap.1 \
                                papstatus.1 \
                                psorder.1
+
+if USE_APPLETALK
+NONGENERATED_MANS += $(ATALK_MANS)
 endif
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
-
 CLEANFILES = $(GENERATED_MANS)
-
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
-
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)