X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=b468cc843b889248724ffc8cc3846d99123c5a2f;hp=0952caeaf61e3d6f80da24bf827eb72578a166fc;hb=1d97f35dd83df6b1278f2a43b670acc42f973860;hpb=1350e8670b34445336f1bf67d78887bb4de27907

diff --git a/Makefile.in b/Makefile.in
index 0952caea..b468cc84 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,9 +22,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 +46,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 +74,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 +85,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)
@@ -155,16 +158,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 +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@ $<
 
@@ -202,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 $(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 +300,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