X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=cd2f9c3ec52c98ee3ac0c840d4a112e56a430f94;hp=f7666ca73b990aeab1f6a809cf3466120476dbc9;hb=6c3da3d98f13377c20b6ade64480e7bb9f6f7320;hpb=79fe17bc95ac8f14398279954d5f033ad75b8395

diff --git a/Makefile.in b/Makefile.in
index f7666ca7..cd2f9c3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,15 +13,20 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = neural discharge
+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
@@ -40,9 +45,10 @@ 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@
+	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))
@@ -51,7 +57,7 @@ PICS := $(wildcard pics/paraslash/*.jpg)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-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))
@@ -91,6 +97,7 @@ 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
 
@@ -132,10 +139,11 @@ 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 \
 		--no-handle-version \
-		--conf-parser \
 		--file-name=$(*F).cmdline \
 		--func-name $(*F)_cmdline_parser \
 		--arg-struct-name=$(*F)_args_info \
@@ -150,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`"; \
@@ -237,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