ogg: Separate ogg from vorbis code.

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 426072c8431ee4466dbfd60ce97012a11da2eb78..e457e490858eea0fc4bbee90b0088347a53c2a52 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,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 := associative expansion
+codename := persistent regularity
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -69,7 +69,7 @@ object_dir := objects
 man_dir := man/man1
 
 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 \
+all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
        osx_write udp_recv amp_filter compress_filter file_write \
        mp3dec_filter prebuffer_filter
 ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
@@ -161,6 +161,10 @@ $(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 
+$(object_dir)/ogg_afh_common.o: ogg_afh_common.c | $(object_dir)
+       @[ -z "$(Q)" ] || echo 'CC $<'
+       $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+
 $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
@@ -179,7 +183,7 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
-       $(Q) $(CC) -c $(CPPFLAGS) -o $@ $<
+       $(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
 
 $(object_dir)/%.o: %.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
@@ -254,7 +258,7 @@ para_afh: $(afh_objs)
 
 clean:
        @[ -z "$(Q)" ] || echo 'CLEAN'
-       $(Q) rm -f $(BINARIES) $(object_dir)/*.o
+       $(Q) rm -f @executables@ $(object_dir)/*.o
 
 clean2: clean
        @[ -z "$(Q)" ] || echo 'CLEAN2'
@@ -275,7 +279,7 @@ maintainer-clean: distclean
 
 install: all man
        mkdir -p $(BINDIR) $(MANDIR)
-       $(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
+       $(install_sh) -s -m 755 @executables@ $(BINDIR)
        $(install_sh) -m 644 $(man_pages) $(MANDIR)
        mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain