X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=fe5bdb61837ae3d5aa3906ee18b6100e4f82e736;hp=cd9e283dd96a7e1268bfda8ba6d1525b12c61533;hb=8978f426314b107c55a652e0151397fdab2f003e;hpb=65616923d1789af7df70b7db7e62bbe5d2a03c22

diff --git a/Makefile.in b/Makefile.in
index cd9e283d..fe5bdb61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,8 +20,15 @@ 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
+
+LDFLAGS += -Wl,--gc-sections
 
 CPPFLAGS += -Os
 CPPFLAGS += -Wall
@@ -40,9 +47,14 @@ CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
-
-BINARIES = para_server para_client para_gui para_audioc para_recv \
-	para_filter para_write @extra_binaries@
+CPPFLAGS += -Wbad-function-cast
+CPPFLAGS += -fdata-sections -ffunction-sections
+CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
+CPPFLAGS += @SSL_CPPFLAGS@
+CPPFLAGS += @ncurses_cppflags@
+
+BINARIES = para_server para_client para_audioc para_recv \
+	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 +63,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 CREDITS INSTALL README FEATURES
 grutatxt_html := $(grutatxt:=.html)
 html_in := $(wildcard web/*.in.html)
 gen_html := $(subst web/,web/sync/,$(html_in))
@@ -91,6 +103,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 +145,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 \
@@ -149,8 +163,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 %_command_list.man: %.cmd
 	./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
+server_command_lists = server_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`"; \
@@ -199,49 +212,50 @@ slider.o: slider.c
 krell.o: krell.c
 	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
 
-mysql_selector.o: mysql_selector.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @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@
+	$(CC) $(LDFLAGS) @recv_objs@ -o $@ @recv_ldflags@
 
 para_filter: @filter_objs@
-	$(CC) @filter_objs@ -o $@ @filter_ldflags@
+	$(CC) $(LDFLAGS) @filter_objs@ -o $@ @filter_ldflags@
 
 para_slider: $(slider_objs)
-	$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
+	$(CC) $(LDFLAGS) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
 
 para_client: @client_objs@
-	$(CC) -o $@ @client_objs@ @client_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @client_objs@ @client_ldflags@
 
 para_gui: @gui_objs@
-	$(CC) -o $@ @gui_objs@ -lncurses
+	$(CC) $(LDFLAGS) -o $@ @gui_objs@ -lncurses
 
 para_audiod: @audiod_objs@
-	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @audiod_objs@ @audiod_ldflags@
 
 para_audioc: @audioc_objs@
-	$(CC) -o $@ @audioc_objs@
+	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
 para_dbadm: $(dbadm_objs)
-	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
+	$(CC) $(LDFLAGS) -o $@ $(dbadm_objs) -lncurses -lmenu
 
 para_fade: $(fade_objs)
-	$(CC) -o $@ $(fade_objs)
+	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
 
 para_server: @server_objs@
-	$(CC) -o $@ @server_objs@  @server_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
+
+para_fsck: @fsck_objs@
+	$(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
 
 para_sdl_gui: $(sdl_gui_objs)
-	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
+	$(CC) $(LDFLAGS) -o $@ $(sdl_gui_objs) -lSDL_image
 
 para_write: @write_objs@
-	$(CC) -o $@ @write_objs@ @write_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
 para_krell.so: $(krell_objs)
 	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared