X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=a0a7fc43623061a88f04bce1d91b424314fbd1fc;hp=a243b7bbede440000ecc188f0d1149b997fb699e;hb=6ce1f648d6e34e49472ce938c83e5bf8e65cd429;hpb=ee41d31b46e6c3213b799d79fb65a5351aa9d221

diff --git a/Makefile.in b/Makefile.in
index a243b7bb..a0a7fc43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,3 @@
-COPYRIGHT = Copyright (c) 1997-2006 by Andre Noll
-DISCLAIMER = This is free software with ABSOLUTELY NO WARRANTY. See COPYING for details.
-
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -16,19 +13,20 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = transient singularity
+codename = isotropic threshold
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-
 DEBUG_CPPFLAGS += -Wredundant-decls
-
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
+# DEBUG_CPPFLAGS += -Wwrite-strings
 
-#CPPFLAGS += -Wwrite-strings
+# invalid option for gcc-3.3.3
+# DEBUG_CPPFLAGS += -Wextra
+# DEBUG_CPPFLAGS += -Wold-style-definition
 
-# invalid option for gcc-3.3.5
-# CPPFLAGS += -Wextra
+# many warnings about trivial stuff
+# CPPFLAGS += -Wconversion
 
 CPPFLAGS += -Os
 CPPFLAGS += -Wall
@@ -47,19 +45,19 @@ CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
+CPPFLAGS += -Wbad-function-cast
 
-BINARIES = para_server para_client para_gui para_audioc para_recv para_filter para_write @extra_binaries@
-
+BINARIES = para_server para_client para_gui para_audioc para_recv \
+	para_filter para_write @extra_binaries@
+man_binaries := $(filter-out para_dbadm para_slider para_krell.so, $(BINARIES))
+man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
+man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)
 PICS := $(wildcard pics/paraslash/*.jpg)
-MANS := $(wildcard doc/man/man1/*.1)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-all_c_files := $(wildcard *.c)
-c_sources := $(filter-out $(gengetopts_c), $(all_c_files))
-grutatxt := COPYING NEWS README.mysql CREDITS INSTALL README \
-	FEATURES GPL
+grutatxt := NEWS README.mysql CREDITS INSTALL README FEATURES
 grutatxt_html := $(grutatxt:=.html)
 html_in := $(wildcard web/*.in.html)
 gen_html := $(subst web/,web/sync/,$(html_in))
@@ -68,28 +66,30 @@ gruta_in := $(grutatxt:=.in.html)
 gruta_in := $(patsubst %,web/%,$(gruta_in))
 gruta_html := $(grutatxt:=.html)
 gruta_html := $(patsubst %,web/sync/%,$(gruta_html))
-shots := gui-2005-11-12.png para_audiod-startup.txt
-shots += para_krell-2005-02.png para_server-startup.txt
-shots += para_slider-2004-12.png sdl_gui.jpg para_krell-2005-02.png
+shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
+	para_server-startup.txt para_slider-2004-12.png sdl_gui.jpg \
+	para_krell-2005-02.png
 shots := $(patsubst %,web/sync/%,$(shots))
 web_pics := web/sync/paraslash.png web/sync/paraslash.ico
-web_misc := demo-script overview.pdf versions/paraslash-git.tar.bz2 PUBLIC_KEY key.anonymous para.css doc
+web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \
+	key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
-
+web_man := web/sync/man
 autocrap := config.h.in configure
-
 tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
-
 tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
 	.changelog_cvs
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
 tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 
-.PHONY: clean distclean maintainer-clean install html www tags ChangeLog doxygen gruta
+.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
+	man html_man
 all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) $(web_man) \
+	tags doxygen
 gruta: $(gen_html) $(gruta_html)
-
+man: $(man_pages)
+html_man: $(man_pages_html)
 
 sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
 	close_on_fork.o string.o stat.o fd.o
@@ -102,7 +102,6 @@ slider_objs = slider.o string.o
 
 include Makefile.deps
 
-V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
 module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
 grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
@@ -141,12 +140,52 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		audioc.ggo) O="--unamed-opts=command";; \
 	esac; \
 	gengetopt $$O \
+		--no-handle-version \
 		--conf-parser \
 		--file-name=$(*F).cmdline \
 		--func-name $(*F)_cmdline_parser \
 		--arg-struct-name=$(*F)_args_info \
 		--set-package="para_$(subst .cmdline,,$(*F))" \
-		--set-version="$V"  < $<
+		--set-version="@PACKAGE_VERSION@"  < $<
+
+%_command_list.c %_command_list.h: %.cmd
+	./command_util.sh c < $< >$@
+	./command_util.sh h < $< >$(@:%.c=%.h)
+
+%_command_list.man: %.cmd
+	./command_util.sh man < $< > $@
+
+server_command_lists = server_command_list.man random_selector_command_list.man \
+	playlist_selector_command_list.man mysql_selector_command_list.man
+man/man1/para_server.1: para_server $(server_command_lists)
+	mkdir -p man/man1
+	opts="-N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
+	help2man $$opts ./para_server > $@
+
+man/man1/para_audiod.1: para_audiod audiod_command_list.man
+	mkdir -p man/man1
+	help2man -N -i audiod_command_list.man ./para_audiod > $@
+
+man/man1/%.1: %
+	mkdir -p man/man1
+	help2man -N ./$< > $@
+
+man/html/%.html: man/man1/%.1
+	mkdir -p man/html
+	man2html $< > $@
+
+
+
+ortp_recv.o: ortp_recv.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+
+ortp_send.o: ortp_send.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+
+oggdec.o: oggdec.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+ogg_afh.o: ogg_afh.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 
 mp3dec.o: mp3dec.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
@@ -160,9 +199,6 @@ aac_common.o: aac_common.c
 aac_afh.o: aac_afh.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
-para_recv: @recv_objs@
-	$(CC) @recv_objs@ -o $@ @recv_ldflags@
-
 slider.o: slider.c
 	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@  @GTK_CFLAGS@ $<
 
@@ -170,13 +206,16 @@ krell.o: krell.c
 	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
 
 mysql_selector.o: mysql_selector.c
-	$(CC)  -Wall -O -g @mysql_cppflags@ -c -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mysql_cppflags@ $<
 
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
 %.o: %.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
+para_recv: @recv_objs@
+	$(CC) @recv_objs@ -o $@ @recv_ldflags@
+
 para_filter: @filter_objs@
 	$(CC) @filter_objs@ -o $@ @filter_ldflags@
 
@@ -215,7 +254,6 @@ para_krell.so: $(krell_objs)
 
 clean:
 	rm -f *.o $(BINARIES)
-
 distclean: clean
 	rm -f Makefile autoscan.log config.status config.log && \
 	rm -rf web/sync/* autom4te.cache aclocal.m4
@@ -223,63 +261,55 @@ distclean: clean
 
 maintainer-clean: distclean
 	rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
-		$(grutatxt_html) ChangeLog* config.h configure \
+		$(grutatxt_html) config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -rf doc
-
-install: all
-	umask 022 && \
-	mkdir -p $(BINDIR) && \
-	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
-	mkdir -p $(FONTDIR) && \
-	$(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
-	mkdir -p $(PICDIR) && \
-	$(install_sh) -m 644 $(PICS) $(PICDIR) && \
-	mkdir -p $(MANDIR) && \
-	$(install_sh) -m 644 $(MANS) $(MANDIR) \
-	mkdir -p $(VARDIR) > /dev/null 2>&1 || exit 0
-
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) doc
-	rm -f $(tarball_pfx).tar.bz2
-	git-tar-tree HEAD $(tarball_pfx) | tar --delete $(tarball_delete) > $(tarball_pfx).tar
+	rm -f *_command_list.* *.man man/man1/* man/html/*
+
+
+install: all man
+	mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR)
+	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
+	$(install_sh) -m 644 $(FONTS) $(FONTDIR)
+	$(install_sh) -m 644 $(PICS) $(PICDIR)
+	$(install_sh) -m 644 $(man_pages) $(MANDIR)
+	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
+
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
+	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
+	git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir $(tarball_pfx)
 	cp -r $(tarball_add) $(tarball_pfx)
-	tar c doc/man | (cd $(tarball_pfx); tar x)
+	mkdir -p $(tarball_pfx)/man/man1
+	cp -r $(man_pages) $(tarball_pfx)/man/man1
 	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
 
-ChangeLog:
-	para_util changelog > $@
 web/%.in.html: %
 	grutatxt -nb  < $< > $@
 tags:
 	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-doc:
-	para_util doc
 web/header2.html: web/header.html
 	sed -e 's|href="|href="\.\.\/\.\./|g' \
 		-e 's|SRC="|SRC="\.\.\/\.\./|g' $< > $@
 doxygen: web/header2.html
 	mkdir -p web/sync/doxygen
 	doxygen
-web/sync/doc: doc
-	cp -a $< $@
-web/sync/doxygen:
+web/sync/man: html_man
 	mkdir -p $@
+	cp -a $(man_pages_html) $@
 web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
 	cat web/header.html $< web/footer.html > $@
 web/sync/%.png: pics/web/%.png web/sync
 	cp $< $@
 web/sync/%.ico: pics/web/%.ico web/sync
 	cp $< $@
-web/sync/demo-script: scripts/demo-script web/sync
-	cp $< $@
 web/sync/para.css: web/para.css web/sync
 	cp $< $@
-web/sync/versions/paraslash-git.tar.bz2: paraslash-git.tar.bz2 web/sync
+web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync
 	cp -a versions web/sync && cp $< $@
 web/sync/overview.pdf: skencil/overview.pdf web/sync
 	cp $< $@