[Gsrc-commit] trunk r3088: fix some out-of-order conditional includes

[Brandon Invergo]

------------------------------------------------------------
revno: 3088
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-30 20:21:08 +0100
message:
  fix some out-of-order conditional includes
modified:
  gnu/gnumach/Makefile           makefile-20121117132611-l3wnpvfoe0fknlwr-3
  gnu/greg/Makefile              makefile-20100615131315-41qpsju0pxske8of-1
  gnu/libxmi/Makefile            makefile-20100615133231-moz7z7p0euds0q8y-1
  gnu/orgadoc/Makefile           makefile-20100610201541-zilbojleihpphujd-81
  gnu/rottlog/Makefile           makefile-20120830221608-bozdrwbss64s2q1n-2

=== modified file 'gnu/gnumach/Makefile'
--- a/gnu/gnumach/Makefile      2014-08-08 07:53:35 +0000
+++ b/gnu/gnumach/Makefile      2014-09-30 19:21:08 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -39,10 +39,10 @@
 
 ######################################################################
 
-       include ../../gar.lib/auto.mk
 ifneq ($(GARARCH),i386)
-       include ../../gar.lib/wrong_arch.mk
+include ../../gar.lib/wrong_arch.mk
 else
+include ../../gar.lib/auto.mk
 include ../../gar.lib/info.mk
 endif
 include config.mk

=== modified file 'gnu/greg/Makefile'
--- a/gnu/greg/Makefile 2014-08-08 07:53:35 +0000
+++ b/gnu/greg/Makefile 2014-09-30 19:21:08 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -43,11 +43,11 @@
 
 ######################################################################
 
-       include ../../gar.lib/auto.mk
 ifeq ($(FORCE_BUILD),y)
+include ../../gar.lib/auto.mk
 include ../../gar.lib/info.mk
 else
-       include ../../gar.lib/broken.mk
+include ../../gar.lib/broken.mk
 endif
 include config.mk
 

=== modified file 'gnu/libxmi/Makefile'
--- a/gnu/libxmi/Makefile       2014-08-08 07:53:35 +0000
+++ b/gnu/libxmi/Makefile       2014-09-30 19:21:08 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -40,10 +40,10 @@
 
 ######################################################################
 
-       include ../../gar.lib/auto.mk
 ifeq ($(FORCE_BUILD),y)
+include ../../gar.lib/auto.mk
 include ../../gar.lib/info.mk
 else
-       include ../../gar.lib/broken.mk
+include ../../gar.lib/broken.mk
 endif
 include config.mk

=== modified file 'gnu/orgadoc/Makefile'
--- a/gnu/orgadoc/Makefile      2014-08-08 07:53:35 +0000
+++ b/gnu/orgadoc/Makefile      2014-09-30 19:21:08 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -38,11 +38,11 @@
 
 ######################################################################
 
-       include ../../gar.lib/auto.mk
 ifeq ($(FORCE_BUILD),y)
+include ../../gar.lib/auto.mk
 include ../../gar.lib/info.mk
 else
-       include ../../gar.lib/broken.mk
+include ../../gar.lib/broken.mk
 endif
 include config.mk
 

=== modified file 'gnu/rottlog/Makefile'
--- a/gnu/rottlog/Makefile      2014-09-30 19:16:59 +0000
+++ b/gnu/rottlog/Makefile      2014-09-30 19:21:08 +0000
@@ -43,10 +43,10 @@
 
 ifeq ($(FORCE_BUILD),y)
 include ../../gar.lib/auto.mk
+include ../../gar.lib/info.mk
 else
 include ../../gar.lib/broken.mk
 endif
-include ../../gar.lib/info.mk
 include config.mk
 
 pre-build: