Merge /home/maan/scm/paraslash_fml/paraslash

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e26deb82da7f01122046971de2156d0a6595708e..230c01177e35f07b23fd76d24fc8470b60cc6bb4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,8 +43,6 @@ CPPFLAGS += -Wshadow
 
 BINARIES = para_server para_client para_gui para_audioc para_recv \
        para_filter para_write @extra_binaries@
-all_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))
@@ -53,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)
@@ -204,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) $<