X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.real;h=29c4bae7e8e593debbe45afd62e143b66c75c218;hb=4c5be8deb22752fad56cff9dd7b35e8d09e3042d;hp=8a3d7acc8c57141a0ae3b7a5a2e43947b1796ae4;hpb=c3c958098baca5651e7bfd6b68ffda475ce671fa;p=paraslash.git

diff --git a/Makefile.real b/Makefile.real
index 8a3d7acc..29c4bae7 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -60,7 +60,7 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 autocrap := config.h.in configure
 tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
-tarball := $(tarball_pfx).tar.bz2
+tarball := $(tarball_pfx).tar.xz
 
 all: $(prefixed_executables) $(man_pages)
 .PHONY: all mostlyclean clean distclean maintainer-clean install \
@@ -113,8 +113,6 @@ STRICT_CFLAGS += -Wformat -Wformat-security
 STRICT_CFLAGS += -Wmissing-format-attribute
 STRICT_CFLAGS += -Wdeclaration-after-statement
 
-LDFLAGS += $(clock_gettime_ldflags)
-
 ifeq ($(uname_s),Linux)
 	# these cause warnings on *BSD
 	CPPFLAGS += -Wunused-macros
@@ -206,7 +204,6 @@ $(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)/aac_afh.o $(dep_dir)/aac_afh.d: CPPFLAGS += $(mp4v2_cppflags)
 $(object_dir)/alsa%.o $(dep_dir)/alsa%.d: CPPFLAGS += $(alsa_cppflags)
 
 $(object_dir)/interactive.o $(dep_dir)/interactive.d \
@@ -225,7 +222,6 @@ $(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)
 
@@ -282,7 +278,7 @@ $(dep_dir)/%.d: %.c | $(dep_dir)
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod \
-: LDFLAGS += $(ao_ldflags) $(pthread_ldflags) $(core_audio_ldflags)
+: LDFLAGS += $(ao_ldflags) $(pthread_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 para_server: LDFLAGS += $(osl_ldflags)
 para_gui: LDFLAGS += $(curses_ldflags)
@@ -323,13 +319,6 @@ para_recv \
 	$(faad_ldflags) \
 	$(flac_ldflags)
 
-para_server \
-para_play \
-para_afh \
-para_recv \
-: LDFLAGS += \
-	$(mp4v2_ldflags)
-
 para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
 
 $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))
@@ -350,7 +339,7 @@ distclean: clean
 	$(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2
+	$(Q) rm -f *.tar.bz2 *.tar.xz
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 INSTALL ?= install
@@ -374,7 +363,7 @@ $(tarball) dist tarball:
 	$(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) xz -9 $(tarball_pfx).tar
 	$(Q) ls -l $(tarball)
-	$(Q) ln -sf $(tarball) paraslash-git.tar.bz2
+	$(Q) ln -sf $(tarball) paraslash-git.tar.xz
 	$(Q) rm -rf $(tarball_pfx)