X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=e1e6c9a97ab89983ad9e717b7ca2e9a4fb4a1b1b;hp=4091600fc0bbaae33d6453cd4ecdec26ac41fe5a;hb=d3a4257406e10fa1bb7b3cb63f6a774436e39317;hpb=9ded969e386009f643fb68355dd7a09d9aa889e6

diff --git a/Makefile.in b/Makefile.in
index 4091600f..e1e6c9a9 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,12 +46,12 @@ 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)
 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)
@@ -72,8 +72,9 @@ shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
 shots := $(patsubst %,web/sync/%,$(shots))
 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 doc
+	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 \
@@ -81,11 +82,14 @@ tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
 tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 
-.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta man
+.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) $(man_pages_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
@@ -191,9 +195,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@ $<
 
@@ -201,13 +202,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@
 
@@ -255,28 +259,24 @@ maintainer-clean: distclean
 	rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
 		$(grutatxt_html) config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -rf doc
 	rm -f *_command_list.* *.man man/man1/* man/html/*
 
 
 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-archive --format=tar --prefix=$(tarball_pfx)/ HEAD | tar --delete $(tarball_delete) > $(tarball_pfx).tar
+	mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(VARDIR)
+	$(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)
+
+@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
@@ -287,18 +287,15 @@ 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