simplify get_atts()

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0952caeaf61e3d6f80da24bf827eb72578a166fc..5afade9fcd98759114947ab0f9fbec4e329d2b21 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,3 @@
-COPYRIGHT = Copyright (c) 1997-2007 by Andre Noll
-DISCLAIMER = This is free software with ABSOLUTELY NO WARRANTY. See COPYING for details.
-
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -22,9 +19,9 @@ DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
-#CPPFLAGS += -Wwrite-strings
+# DEBUG_CPPFLAGS += -Wwrite-strings
 # invalid option for gcc-3.3.5
-# CPPFLAGS += -Wextra
+# DEBUG_CPPFLAGS += -Wextra
 
 CPPFLAGS += -Os
 CPPFLAGS += -Wall
@@ -46,7 +43,8 @@ CPPFLAGS += -Wshadow
 
 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_binaries := para_server para_client para_gui para_audioc para_recv \
+        para_filter para_write  para_fade para_sdl_gui para_audiod
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)
@@ -73,6 +71,7 @@ web_pics := web/sync/paraslash.png web/sync/paraslash.ico
 web_misc := overview.pdf versions/paraslash-git.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 \
@@ -83,7 +82,8 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 .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
+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)
@@ -99,7 +99,6 @@ slider_objs = slider.o string.o
 
 include Makefile.deps
 
-V := (@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
@@ -138,12 +137,13 @@ 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 < $< >$@
@@ -155,16 +155,20 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 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: %
-       help2man -N $< > $@
+       mkdir -p man/man1
+       help2man -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
+       mkdir -p man/html
        man2html $< > $@
 
 
@@ -192,9 +196,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@ $<
 
@@ -202,13 +203,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 $(DEBUG_CPPFLAGS) -Wall -O -g @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@
 
@@ -293,8 +297,6 @@ doxygen: web/header2.html
 web/sync/man: html_man
        mkdir -p $@
        cp -a $(man_pages_html) $@
-web/sync/doxygen:
-       mkdir -p $@
 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