Merge commit 'meins/next' into next

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b4392a3c63a8bddca224300b00c2e5d9de5a6177..d8b82e60d61b6c9bcc66dd9d539811505573e411 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := symplectic separability
+codename := simultaneous independence
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -55,19 +55,21 @@ CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
+CPPFLAGS += -I/usr/local/include
+CPPFLAGS += @osl_cppflags@
 
 BINARIES = para_server para_client para_audioc para_recv \
-       para_filter para_write para_fsck para_afh @extra_binaries@
+       para_filter para_write para_afh @extra_binaries@
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
 
 ggo_dir := ggo
 
-m4_ggos := afh audioc audiod client filter fsck gui recv server write
+m4_ggos := afh audioc audiod client filter gui recv server write
 all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write oss_write fade http_recv \
        osx_write udp_recv amp_filter compress_filter file_write \
-       grab_client mp3dec_filter
+       mp3dec_filter
 ggo_generated := $(addsuffix .cmdline.c, $(all_ggos)) $(addsuffix .cmdline.h, $(all_ggos)) \
        $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
 
@@ -164,9 +166,6 @@ para_fade: @fade_objs@
 para_server: @server_objs@
        $(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
 
-para_fsck: @fsck_objs@
-       $(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
-
 para_write: @write_objs@
        $(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
@@ -175,6 +174,7 @@ para_afh: @afh_objs@
 
 clean:
        rm -f *.o $(BINARIES)
+       rm -f *_command_list.*
        rm -rf man
 distclean: clean
        rm -f Makefile autoscan.log config.status config.log && \
@@ -185,7 +185,6 @@ maintainer-clean: distclean
        rm -f $(ggo_generated) *.tar.bz2 \
                config.h configure \
                config.h.in skencil/*.pdf skencil/*.ps
-       rm -f *_command_list.* *.man man/man1/*
        rm -rf web_sync
 
 install: all man