X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=660c381b5815f10d7dc9cd95f28c7cdc955e2366;hp=7e6287e0d0ff72e1e6842535d8f665db70068e0b;hb=c0abcee0da53a6b399c3d16a62830aaa9ae21349;hpb=0440ca41086eafb233b5cb516419de830a0bec13

diff --git a/Makefile.in b/Makefile.in
index 7e6287e0..660c381b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,6 +11,9 @@ install_sh := @install_sh@
 cmdline_dir := @cmdline_dir@
 executables := @executables@
 
+GENGETOPT := @gengetopt@
+HELP2MAN := @help2man@
+
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
@@ -19,9 +22,9 @@ codename := nested assignment
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
-DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
-DEBUG_CPPFLAGS += -Wall
+DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
 DEBUG_CPPFLAGS += -Wformat-security
 DEBUG_CPPFLAGS += -Wmissing-format-attribute
 # produces false positives
@@ -75,14 +78,12 @@ all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
 	osx_write udp_recv amp_filter compress_filter file_write \
 	mp3dec_filter prebuffer_filter
 ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
-cmdline_generated := $(addprefix $(cmdline_dir)/,$(addsuffix .cmdline.c, $(all_ggos)) \
-	$(addsuffix .cmdline.h, $(all_ggos)))
 
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
 	web versions .changelog_before_cvs .changelog_cvs .gitignore\
-	$(ggo_dir) skencil)
+	skencil)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
@@ -123,17 +124,17 @@ server_command_lists_ch = server_command_list.c afs_command_list.c \
 	server_command_list.h afs_command_list.h
 server_command_lists_man = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
+	@[ -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 > $@
+	$(HELP2MAN) $$opts ./para_server > $@
 
 man/man1/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
-	$(Q) help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+	@[ -z "$(Q)" ] || echo 'MAN $<'
+	$(Q) $(HELP2MAN) -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
 
 man/man1/%.1: % | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
-	$(Q) help2man -h --detailed-help -N ./$< > $@
+	@[ -z "$(Q)" ] || echo 'MAN $<'
+	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
 	@[ -z "$(Q)" ] || echo 'MAN2HTML $<'
@@ -284,8 +285,8 @@ clean:
 
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
-	$(Q) rm -rf man $(object_dir)
-	$(Q) rm -f *_command_list.*
+	$(Q) rm -rf man $(object_dir) $(cmdline_dir)
+	$(Q) rm -f *_command_list.* $(ggo_generated)
 
 distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
@@ -294,10 +295,10 @@ distclean: clean2 test-clean
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-	rm -f $(ggo_generated) *.tar.bz2 \
+	rm -f *.tar.bz2 \
 		config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -rf web_sync $(cmdline_dir)
+	rm -rf web_sync
 
 install: all man
 	mkdir -p $(BINDIR) $(MANDIR)
@@ -305,19 +306,17 @@ install: all man
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-$(tarball): $(cmdline_generated)
+$(tarball):
 	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
 	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
-	mkdir -p $(tarball_pfx)/$(cmdline_dir)
+	mkdir -p $(tarball_pfx)
 	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
 	cp -r $(autocrap) $(tarball_pfx)
-	cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-	rm -rf $(tarball_pfx)
 	bzip2 -9 $(tarball_pfx).tar
-	rm -f $(tarball_pfx).tar
 	ls -l $(tarball_pfx).tar.bz2
+	rm -rf $(tarball_pfx)
 %.ps: %.sk
 	sk2ps $< > $@
 %.pdf: %.ps