build: Reorder Makefile.real.

Trivial cleanup. Only code move, no actual changes.

diff --git a/Makefile.real b/Makefile.real
index b02a5f44c20b34df0430bf02708754e45fdf065d..ab64f3cc73f6d3713586fc45155494df44bc254a 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -11,8 +11,6 @@ uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 cc_version := $(shell $(CC) --version | head -n 1)
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 

-m4_ggo_dir := m4/gengetopt
-test_dir := t

 ifeq ("$(origin O)", "command line")
        build_dir := $(O)
 else
 ifeq ("$(origin O)", "command line")
        build_dir := $(O)
 else


@@ -26,6 +24,8 @@ cmdline_dir := $(build_dir)/cmdline
 m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 hostbin_dir := $(build_dir)/host/bin
 m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 hostbin_dir := $(build_dir)/host/bin

+m4_ggo_dir := m4/gengetopt
+test_dir := t

 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \


@@ -47,6 +47,40 @@ write_objs := $(addprefix $(object_dir)/, $(write_objs))
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
 play_objs := $(addprefix $(object_dir)/, $(play_objs))
 
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
 play_objs := $(addprefix $(object_dir)/, $(play_objs))
 

+man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
+
+autocrap := config.h.in configure
+tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+tarball_delete := $(addprefix $(tarball_pfx)/,\
+       web .changelog_before_cvs .changelog_cvs .gitignore)
+tarball := $(tarball_pfx).tar.bz2
+
+.PHONY: dep all clean distclean maintainer-clean install man tarball
+all: dep $(prefixed_executables) $(man_pages)
+dep: $(deps)
+man: $(man_pages)
+tarball: $(tarball)
+
+include $(m4_ggo_dir)/makefile
+include $(test_dir)/makefile.test
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
+-include $(deps)
+-include $(m4_deps)
+endif
+
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
+               $(help2man_dir) $(hostbin_dir):
+       $(Q) $(MKDIR_P) $@
+
+# When in doubt, use brute force (Ken Thompson)
+TOUPPER = \
+$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
+$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,\
+$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,\
+$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
+$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
+$(subst z,Z,$1))))))))))))))))))))))))))
+

 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls


@@ -81,14 +115,6 @@ 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_delete := $(addprefix $(tarball_pfx)/,\
-       web .changelog_before_cvs .changelog_cvs .gitignore)
-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
 ifeq ("$(origin V)", "command line")
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 ifeq ("$(origin V)", "command line")


@@ -97,27 +123,6 @@ else
        Q := @
 endif
 
        Q := @
 endif
 

-.PHONY: dep all clean distclean maintainer-clean install man tarball
-all: dep $(prefixed_executables) $(man_pages)
-dep: $(deps)
-man: $(man_pages)
-tarball: $(tarball)
-
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-               $(help2man_dir) $(hostbin_dir):
-       $(Q) $(MKDIR_P) $@
-
--include $(m4_ggo_dir)/makefile
-
-# When in doubt, use brute force (Ken Thompson)
-TOUPPER = \
-$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
-$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,\
-$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,\
-$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
-$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
-$(subst z,Z,$1))))))))))))))))))))))))))
-

 %_command_list.h: %.cmd %.c
        @[ -z "$(Q)" ] || echo 'GEN $@'
        $(Q) ./command_util.sh h < $< >$@
 %_command_list.h: %.cmd %.c
        @[ -z "$(Q)" ] || echo 'GEN $@'
        $(Q) ./command_util.sh h < $< >$@


@@ -201,11 +206,6 @@ $(dep_dir)/%.d: %.c error2.h | $(dep_dir)
        $(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
                $(CPPFLAGS) $< > $@
 
        $(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
                $(CPPFLAGS) $< > $@
 

-ifeq ($(findstring clean, $(MAKECMDGOALS)),)
--include $(deps)
--include $(m4_deps)
-endif
-

 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)


@@ -298,4 +298,3 @@ $(tarball):
        bzip2 -9 $(tarball_pfx).tar
        ls -l $(tarball_pfx).tar.bz2
        rm -rf $(tarball_pfx)
        bzip2 -9 $(tarball_pfx).tar
        ls -l $(tarball_pfx).tar.bz2
        rm -rf $(tarball_pfx)

-include $(test_dir)/makefile.test