X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=409725e1e18b4efac98c61b4a6e7bd94b33a14b4;hb=aab667adba868be9e9038a8686dc4919a5a8e96d;hp=487a9efe2bb6f51f9b3d5ad279aeae2cc5a2c469;hpb=439d8d00c44b61ea1d1eee9caca91ad71aae389e;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index 487a9efe..409725e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
 cmdline_dir := $(build_dir)/cmdline
 m4depdir := $(build_dir)/m4deps
+help2man_dir := $(build_dir)/help2man
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -86,8 +87,7 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(executables))
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web .changelog_before_cvs .changelog_cvs .gitignore\
-	skencil)
+	web .changelog_before_cvs .changelog_cvs .gitignore)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
@@ -104,7 +104,8 @@ dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir):
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
+		$(help2man_dir):
 	$(Q) $(MKDIR_P) $@
 
 -include $(m4_ggo_dir)/makefile
@@ -134,22 +135,22 @@ afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.
 audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
 
 server_command_lists_man = server_command_list.man afs_command_list.man
-$(man_dir)/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
+$(man_dir)/para_server.1: $(help2man_dir)/para_server $(server_command_lists_man) | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) opts="-h --detailed-help -N `for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
-	$(HELP2MAN) $$opts ./para_server > $@
+	$(Q) opts="`for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
+	$(HELP2MAN) $$opts ./$< > $@
 
-$(man_dir)/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
+$(man_dir)/para_audiod.1: $(help2man_dir)/para_audiod audiod_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+	$(Q) $(HELP2MAN) -N -i audiod_command_list.man ./$< > $@
 
-$(man_dir)/para_play.1: para_play play_command_list.man | $(man_dir)
+$(man_dir)/para_play.1: $(help2man_dir)/para_play play_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N -i play_command_list.man ./para_play > $@
+	$(Q) $(HELP2MAN) -N -i play_command_list.man ./$< > $@
 
-$(man_dir)/%.1: % | $(man_dir)
+$(man_dir)/%.1: $(help2man_dir)/% | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
+	$(Q) $(HELP2MAN) -N ./$< > $@
 
 $(object_dir)/crypt.o: crypt.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -310,9 +311,7 @@ distclean: clean2 test-clean
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-	rm -f *.tar.bz2 \
-		config.h configure \
-		config.h.in skencil/*.pdf skencil/*.ps
+	rm -f *.tar.bz2 config.h configure config.h.in
 	rm -rf web_sync
 
 install: all man
@@ -332,9 +331,4 @@ $(tarball):
 	bzip2 -9 $(tarball_pfx).tar
 	ls -l $(tarball_pfx).tar.bz2
 	rm -rf $(tarball_pfx)
-%.ps: %.sk
-	sk2ps $< > $@
-%.pdf: %.ps
-	ps2pdf - - < $< > $@
-
 include $(test_dir)/makefile.test