X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=cd2f9c3ec52c98ee3ac0c840d4a112e56a430f94;hp=b468cc843b889248724ffc8cc3846d99123c5a2f;hb=769888ee3175ed60df3c23caf51cdad5db33d141;hpb=1d97f35dd83df6b1278f2a43b670acc42f973860 diff --git a/Makefile.in b/Makefile.in index b468cc84..cd2f9c3e 100644 --- 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@ @@ -16,15 +13,20 @@ 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 # produces false positives # DEBUG_CPPFLAGS += -Wunreachable-code # DEBUG_CPPFLAGS += -Wwrite-strings -# invalid option for gcc-3.3.5 + +# invalid option for gcc-3.3.3 # DEBUG_CPPFLAGS += -Wextra +# DEBUG_CPPFLAGS += -Wold-style-definition + +# many warnings about trivial stuff +# CPPFLAGS += -Wconversion CPPFLAGS += -Os CPPFLAGS += -Wall @@ -43,11 +45,11 @@ 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@ -man_binaries := para_server para_client para_gui para_audioc para_recv \ - para_filter para_write para_fade para_sdl_gui para_audiod + para_filter para_write para_fsck @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) @@ -55,9 +57,7 @@ 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 := 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)) @@ -71,7 +71,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 @@ -97,12 +97,12 @@ dbadm_objs = dbadm.o exec.o close_on_fork.o string.o fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o krell_objs = krell.o string.o slider_objs = slider.o string.o +fsck_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o *.o: para.h config.h gcc-compat.h 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 @@ -139,14 +139,16 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo %.cmdline.h %.cmdline.c: %.ggo case $< in client.ggo) O="--unamed-opts=command";; \ audioc.ggo) O="--unamed-opts=command";; \ + fsck.ggo) O="--unamed-opts=table";; \ esac; \ + echo "$O"; if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \ gengetopt $$O \ - --conf-parser \ + --no-handle-version \ --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 < $< >$@ @@ -156,7 +158,8 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo ./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 + playlist_selector_command_list.man mysql_selector_command_list.man \ + afs_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`"; \ @@ -206,7 +209,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) $< @@ -243,6 +246,9 @@ para_fade: $(fade_objs) para_server: @server_objs@ $(CC) -o $@ @server_objs@ @server_ldflags@ +para_fsck: @fsck_objs@ + $(CC) -o $@ @fsck_objs@ @fsck_ldflags@ + para_sdl_gui: $(sdl_gui_objs) $(CC) -o $@ $(sdl_gui_objs) -lSDL_image @@ -266,12 +272,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) @@ -308,7 +315,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 $< $@