X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=88d15932799c151ab8dac8df25a9561480b7bf5a;hp=cf9598f71a0da39073d9dba6b8e85b9be5e4cbca;hb=ad386453c0a3153783cb8f506f668118e58d0a32;hpb=09a69f08d83ad23e806f0412fbc3f98b1410b115

diff --git a/Makefile.in b/Makefile.in
index cf9598f7..88d15932 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,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 := hybrid causality
+codename := mutual diversity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
@@ -45,6 +45,8 @@ ifeq ($(uname_s),Linux)
 	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
@@ -56,7 +58,6 @@ CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-noreturn
-CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
@@ -118,9 +119,6 @@ $(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
 $(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
 $(subst z,Z,$1))))))))))))))))))))))))))
 
-%_command_list.c: %.cmd
-	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh c < $< >$@
 %_command_list.h: %.cmd
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.sh h < $< >$@
@@ -204,6 +202,10 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @id3tag_cppflags@ $<
+
 $(object_dir)/gui%.o: gui%.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<