X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=3631a5c9f47569c48d38df3877cea286a12e468b;hp=a2e6a423dd6624c4538954637feca67bbe9dbc44;hb=b59e841036a107b52a0221e48d7e05f86da92979;hpb=bd374f0948c77dd91287f73f7573bf59f3fb5666

diff --git a/Makefile.real b/Makefile.real
index a2e6a423..3631a5c9 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -10,7 +10,6 @@ endif
 LOGLEVELS := LL_DEBUG,LL_INFO,LL_NOTICE,LL_WARNING,LL_ERROR,LL_CRIT,LL_EMERG
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
-STRIP := $(CROSS_COMPILE)strip
 MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
@@ -76,12 +75,13 @@ 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
 
-.PHONY: all clean clean2 distclean maintainer-clean install man tarball
 all: $(prefixed_executables) $(man_pages)
+.PHONY: all mostlyclean clean distclean maintainer-clean install \
+	install-strip man dist tarball
+
 man: $(man_pages)
-tarball: $(tarball)
 
 include $(lls_m4_dir)/makefile
 include $(test_dir)/makefile.test
@@ -116,8 +116,6 @@ STRICT_CFLAGS += -Wno-sign-compare -Wno-unknown-pragmas
 STRICT_CFLAGS += -Wdeclaration-after-statement
 STRICT_CFLAGS += -Wformat -Wformat-security -Wmissing-format-attribute
 
-LDFLAGS += $(clock_gettime_ldflags)
-
 ifeq ($(uname_s),Linux)
 	# these cause warnings on *BSD
 	CPPFLAGS += -Wunused-macros
@@ -183,7 +181,6 @@ $(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
 $(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
 $(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
 $(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
-$(object_dir)/aac_afh.o: CPPFLAGS += $(mp4v2_cppflags)
 $(object_dir)/alsa%.o: CPPFLAGS += $(alsa_cppflags)
 
 $(object_dir)/interactive.o \
@@ -202,7 +199,6 @@ $(object_dir)/mp3dec_filter.o \
 : CPPFLAGS += $(mad_cppflags)
 
 $(object_dir)/aacdec_filter.o \
-$(object_dir)/aac_common.o \
 $(object_dir)/aac_afh.o \
 : CPPFLAGS += $(faad_cppflags)
 
@@ -245,7 +241,7 @@ $(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h)
 
 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)
@@ -301,13 +297,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)))
@@ -315,31 +304,36 @@ $(prefixed_executables):
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $^ -o $@ $(LDFLAGS)
 
-clean:
-	@[ -z "$(Q)" ] || echo 'CLEAN'
+mostlyclean:
+	@[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
 	$(Q) rm -f para_*
 	$(Q) rm -rf $(object_dir)
-
-clean2: clean
-	@[ -z "$(Q)" ] || echo 'CLEAN2'
+clean: mostlyclean
+	@[ -z "$(Q)" ] || echo 'CLEAN'
 	$(Q) rm -rf $(build_dir)
-distclean: clean2 test-clean
+distclean: clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
-
+	$(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
+	$(Q) rm -f *.tar.bz2 *.tar.xz
+	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
+
+INSTALL ?= install
+INSTALL_PROGRAM ?= $(INSTALL)
+INSTALL_DATA ?= $(INSTALL) -m 644
+ifneq ($(findstring strip, $(MAKECMDGOALS)),)
+	strip_option := -s
+endif
 
-install: all man
-	$(MKDIR_P) $(bindir) $(mandir)
-	$(INSTALL) -s --strip-program $(STRIP) -m 755 \
-		$(prefixed_executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
-	$(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
+install install-strip: all man
+	$(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+	$(INSTALL) $(strip_option) $(prefixed_executables) $(DESTDIR)$(bindir)
+	$(INSTALL_DATA) $(man_pages) $(DESTDIR)$(mandir)
+	$(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-$(tarball):
+$(tarball) dist tarball:
 	$(Q) rm -rf $(tarball) $(tarball_pfx)
 	$(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
@@ -347,7 +341,7 @@ $(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)