new codename, reset version to git

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7dd99ac2b7fbd70965c1004934b8ddecc3e0cd8d..cd9e283dd96a7e1268bfda8ba6d1525b12c61533 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = inductive resonance
+codename = isotropic threshold
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -43,8 +43,7 @@ CPPFLAGS += -Wshadow
 
 BINARIES = para_server para_client para_gui para_audioc para_recv \
        para_filter para_write @extra_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_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)
@@ -52,8 +51,6 @@ PICS := $(wildcard pics/paraslash/*.jpg)
 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_html := $(grutatxt:=.html)
 html_in := $(wildcard web/*.in.html)
@@ -68,7 +65,7 @@ shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
        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 \
+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
@@ -155,16 +152,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: %
+       mkdir -p man/man1
        help2man -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
+       mkdir -p man/html
        man2html $< > $@
 
 
@@ -199,7 +200,7 @@ krell.o: krell.c
        $(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
 
 mysql_selector.o: mysql_selector.c
-       $(CC) -c $(DEBUG_CPPFLAGS) -Wall -O -g @mysql_cppflags@ $<
+       $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mysql_cppflags@ $<
 
 %.cmdline.o: %.cmdline.c
        $(CC) -c $(CPPFLAGS) $<
@@ -259,12 +260,13 @@ maintainer-clean: distclean
        rm -f *_command_list.* *.man man/man1/* man/html/*
 
 
-install: all
-       mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(VARDIR)
+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)
@@ -301,7 +303,7 @@ web/sync/%.ico: pics/web/%.ico 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 $< $@