X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=c572100b0663f21cc4a5cef3309a4b64a62d3f63;hb=a05a33be9ed15982aabfa13726317a1fcb13cc19;hp=0cce0a7739e37a9709d7190ee84019b33a77307b;hpb=e95fc5a017e89dd9004836d759163056b0dc7095;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index 0cce0a77..c572100b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,8 +46,11 @@ CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
 CPPFLAGS += -Wbad-function-cast
+CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
+CPPFLAGS += @SSL_CPPFLAGS@
+CPPFLAGS += @ncurses_cppflags@
 
-BINARIES = para_server para_client para_gui para_audioc para_recv \
+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))
@@ -97,7 +100,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_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -139,10 +142,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 \
@@ -212,6 +216,7 @@ mysql_selector.o: mysql_selector.c
 
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
+
 %.o: %.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
@@ -234,7 +239,7 @@ para_audiod: @audiod_objs@
 	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
 
 para_audioc: @audioc_objs@
-	$(CC) -o $@ @audioc_objs@
+	$(CC) -o $@ @audioc_objs@ @audioc_ldflags@
 
 para_dbadm: $(dbadm_objs)
 	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
@@ -245,8 +250,8 @@ para_fade: $(fade_objs)
 para_server: @server_objs@
 	$(CC) -o $@ @server_objs@  @server_ldflags@
 
-para_fsck: $(fsck_objs)
-	$(CC) -o $@ $(fsck_objs) -lssl
+para_fsck: @fsck_objs@
+	$(CC) -o $@ @fsck_objs@ @fsck_ldflags@
 
 para_sdl_gui: $(sdl_gui_objs)
 	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image