autocrap := config.h.in configure
tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-tarball_delete := $(addprefix $(tarball_pfx)/,\
- web .changelog_before_cvs .changelog_cvs .gitignore)
+tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
tarball := $(tarball_pfx).tar.bz2
-.PHONY: dep all clean distclean maintainer-clean install man tarball
+.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
all: dep $(prefixed_executables) $(man_pages)
dep: $(deps)
man: $(man_pages)
$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
$(subst z,Z,$1))))))))))))))))))))))))))
-
-DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
-DEBUG_CPPFLAGS += -Wredundant-decls
-DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
-DEBUG_CPPFLAGS += -Wformat-security
-DEBUG_CPPFLAGS += -Wmissing-format-attribute
-
-ifeq ($(uname_s),Linux)
- CPPFLAGS += -fdata-sections -ffunction-sections
- LDFLAGS += -Wl,--gc-sections
- CPPFLAGS += -Wstrict-prototypes
- CPPFLAGS += -Wshadow
- # causes warnings on *BSD for the feature test macros
- CPPFLAGS += -Wunused-macros
-endif
-CPPFLAGS += -Os
-CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wchar-subscripts
CPPFLAGS += -DBINDIR='"$(BINDIR)"'
CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
-CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-noreturn
-CPPFLAGS += -Wbad-function-cast
-CPPFLAGS += -fno-strict-aliasing
CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
CPPFLAGS += $(arch_cppflags)
CPPFLAGS += -I/usr/local/include
CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += $(osl_cppflags)
+
+CFLAGS += -Os
+CFLAGS += -Wuninitialized
+CFLAGS += -Wchar-subscripts
+CFLAGS += -Werror-implicit-function-declaration
+CFLAGS += -Wmissing-noreturn
+CFLAGS += -Wbad-function-cast
+CFLAGS += -fno-strict-aliasing
+
+ifeq ($(uname_s),Linux)
+ CFLAGS += -fdata-sections -ffunction-sections
+ CFLAGS += -Wstrict-prototypes
+ CFLAGS += -Wshadow
+ # causes warnings on *BSD for the feature test macros
+ CFLAGS += -Wunused-macros
+ LDFLAGS += -Wl,--gc-sections
+endif
+
+STRICT_CFLAGS = $(CFLAGS)
+STRICT_CFLAGS += -g -Wunused -Wundef -W
+STRICT_CFLAGS += -Wredundant-decls
+STRICT_CFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
+STRICT_CFLAGS += -Wformat-security
+STRICT_CFLAGS += -Wmissing-format-attribute
LDFLAGS += $(clock_gettime_ldflags)
@echo "$(object_executable_matrix)" | $< > $@
$(object_dir)/%.o: %.c | $(object_dir)
-$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
-$(object_dir)/gui%.o: CPPFLAGS += $(curses_cppflags)
-$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags)
-$(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
-
-$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
-$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
-$(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
-$(object_dir)/compress_filter.o: CPPFLAGS += -O3
-$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
-
-$(object_dir)/aacdec_filter.o \
-$(object_dir)/aac_common.o \
-$(object_dir)/aac_afh.o \
+
+$(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
+$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags)
+$(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags)
+$(object_dir)/mp3_afh.o $(dep_dir)/mp3_afh.d: CPPFLAGS += $(id3tag_cppflags)
+$(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags)
+$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags)
+
+$(object_dir)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \
+: CPPFLAGS += $(mad_cppflags)
+
+$(object_dir)/aacdec_filter.o $(dep_dir)/aacdec_filter.d \
+$(object_dir)/aac_common.o $(dep_dir)/aac_common.d \
+$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d \
: CPPFLAGS += $(faad_cppflags)
-$(object_dir)/spx_common.o \
-$(object_dir)/spxdec_filter.o \
-$(object_dir)/spx_afh.o \
-$(object_dir)/oggdec_filter.o \
-$(object_dir)/ogg_afh.o \
-$(object_dir)/ogg_afh_common.o \
+$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \
+$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \
+: CPPFLAGS += $(vorbis_cppflags)
+
+$(object_dir)/spx_common.o $(dep_dir)/spx_common.d \
+$(object_dir)/spxdec_filter.o $(dep_dir)/spxdec_filter.d \
+$(object_dir)/spx_afh.o $(dep_dir)/spx_afh.d \
+$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \
+$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \
+$(object_dir)/ogg_afh_common.o $(dep_dir)/ogg_afh_common.d \
+$(object_dir)/opus%.o $(dep_dir)/opus%.d \
: CPPFLAGS += $(ogg_cppflags)
+$(object_dir)/afs.o $(dep_dir)/afs.d \
+$(object_dir)/aft.o $(dep_dir)/aft.d \
+$(object_dir)/attribute.o $(dep_dir)/attribute.d \
+$(object_dir)/blob.o $(dep_dir)/blob.d \
+$(object_dir)/mood.o $(dep_dir)/mood.d \
+$(object_dir)/playlist.o $(dep_dir)/playlist.d \
+$(object_dir)/score.o $(dep_dir)/score.d \
+$(object_dir)/server.o $(dep_dir)/server.d \
+$(object_dir)/vss.o $(dep_dir)/vss.d \
+$(object_dir)/command.o $(dep_dir)/command.d \
+$(object_dir)/http_send.o $(dep_dir)/http_send.d \
+$(object_dir)/dccp_send.o $(dep_dir)/dccp_send.d \
+$(object_dir)/udp_send.o $(dep_dir)/udp_send.d \
+$(object_dir)/send_common.o $(dep_dir)/send_common.d \
+$(object_dir)/mm.o $(dep_dir)/mm.d \
+: CPPFLAGS += $(osl_cppflags)
+
+$(object_dir)/%.cmdline.o: CFLAGS += -Wno-unused-function
+$(object_dir)/compress_filter.o: CFLAGS += -O3
+
$(object_dir)/%.o: %.c | $(object_dir)
@[ -z "$(Q)" ] || echo 'CC $<'
- $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+ $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(STRICT_CFLAGS) $<
$(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
@[ -z "$(Q)" ] || echo 'CC $<'
- $(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
+ $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
$(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c error2.h | $(dep_dir)
@[ -z "$(Q)" ] || echo 'DEP $<'
$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
$(tarball):
- rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
- git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+ $(Q) rm -rf $(tarball) $(tarball_pfx)
+ $(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
| tar --delete $(tarball_delete) > $(tarball_pfx).tar
- $(MKDIR_P) $(tarball_pfx)
- ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
- cp -r $(autocrap) $(tarball_pfx)
- tar rf $(tarball_pfx).tar $(tarball_pfx)/*
- bzip2 -9 $(tarball_pfx).tar
- ls -l $(tarball_pfx).tar.bz2
- rm -rf $(tarball_pfx)
+ $(Q) $(MKDIR_P) $(tarball_pfx)
+ $(Q) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
+ $(Q) cp $(autocrap) $(tarball_pfx)
+ $(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
+ $(Q) bzip2 -9 $(tarball_pfx).tar
+ $(Q) ls -l $(tarball)
+ $(Q) rm -rf $(tarball_pfx)