X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=fdae39a8f38b6bf4c4f1997bc11df3c58026ab41;hp=ab2389536fd29a9b1cb6196c068a33b122600fd8;hb=44061c80a062f2b37c7a222893c8faa725ee5912;hpb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87

diff --git a/Makefile.real b/Makefile.real
index ab238953..fdae39a8 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -171,34 +171,37 @@ error2.h: $(hostbin_dir)/error2 Makefile
 	@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)/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)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
 
-$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
-$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
-$(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
-$(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_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)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \
+: CPPFLAGS += $(mad_cppflags)
+
 $(object_dir)/compress_filter.o: CPPFLAGS += -O3
-$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
+$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags)
 
-$(object_dir)/aacdec_filter.o \
-$(object_dir)/aac_common.o \
-$(object_dir)/aac_afh.o \
+$(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)/ogg_afh.o \
-$(object_dir)/oggdec_filter.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 \
-$(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)/opus%.o \
+$(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)/%.o: %.c | $(object_dir)
@@ -207,7 +210,7 @@ $(object_dir)/%.o: %.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) -Wno-unused-function -o $@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $<
 
 $(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c error2.h | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
@@ -301,13 +304,13 @@ install: all man
 	$(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)