Merge branch 'refs/heads/t/makefile_conventions'

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index ef4b51c4274cf9c54be47a1f1955225ab83b67dd..5e4dbe68c0308bf1b385c84e94d808d4f740b625 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -64,9 +64,9 @@ tarball := $(tarball_pfx).tar.bz2
 
 all: $(prefixed_executables) $(man_pages)
 .PHONY: all mostlyclean clean distclean maintainer-clean install \
-       install-strip man tarball
+       install-strip man dist tarball
+
 man: $(man_pages)
-tarball: $(tarball)
 
 include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
@@ -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
@@ -282,7 +280,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)
@@ -366,7 +364,7 @@ install install-strip: all man
        $(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