build: Reorder variables in Makefile.in.

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 93aae7cefa2649126ab8b563faab35f1754d9d4b..f453ed054939cfeeab02be5a34aeb9f292a7fa50 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,22 +1,21 @@
 prefix := @prefix@
 exec_prefix := @exec_prefix@
 
+# These two use prefix and exec_prefix
 BINDIR := @bindir@
-VARDIR := /var/paraslash
-MANDIR := @datarootdir@/man/man1
-PACKAGE_VERSION := @PACKAGE_VERSION@
-INSTALL := @install@
-STRIP := $(CROSS_COMPILE)strip
-HOSTCC ?= cc
-executables := @executables@
-ggo_descriptions_declared := @ggo_descriptions_declared@
-object_executable_matrix := @object_executable_matrix@
+datarootdir := @datarootdir@
 
+PACKAGE_TARNAME := @PACKAGE_TARNAME@
+PACKAGE_VERSION := @PACKAGE_VERSION@
 
+INSTALL := @install@
 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
-MKDIR_P := mkdir -p
 
+ggo_descriptions_declared := @ggo_descriptions_declared@
+object_executable_matrix := @object_executable_matrix@
+
+executables := @executables@
 recv_objs := @recv_objs@
 filter_objs := @filter_objs@
 client_objs := @client_objs@
@@ -41,6 +40,7 @@ faad_cppflags := @faad_cppflags@
 curses_cppflags := @curses_cppflags@
 ao_cppflags := @ao_cppflags@
 
+clock_gettime_ldflags := @clock_gettime_ldflags@
 id3tag_ldflags := @id3tag_ldflags@
 ogg_ldflags := @ogg_ldflags@
 vorbis_ldflags := @vorbis_ldflags@
@@ -62,13 +62,17 @@ nsl_ldflags := @nsl_ldflags@
 curses_ldflags := @curses_ldflags@
 core_audio_ldflags := @core_audio_ldflags@
 
+VARDIR := /var/paraslash
+MANDIR := $(datarootdir)/man/man1
+STRIP := $(CROSS_COMPILE)strip
+HOSTCC ?= cc
+MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
 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)
-
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt
@@ -139,15 +143,15 @@ CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += $(osl_cppflags)
 
-LDFLAGS += @clock_gettime_ldflags@
+LDFLAGS += $(clock_gettime_ldflags)
 
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
+tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
        web .changelog_before_cvs .changelog_cvs .gitignore)
-tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
+tarball := $(tarball_pfx).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands