1. 25 Jul, 2012 5 commits
  2. 23 Jul, 2012 8 commits
    • Iustin Pop's avatar
      Build epydoc.conf using standard replace_vars_sed · fc1282b8
      Iustin Pop authored
      This is just begging to be converted to a standard replace_vars_sed
      rule, instead of custom sed calls.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      fc1282b8
    • Iustin Pop's avatar
      Simplify some make rules · 55398706
      Iustin Pop authored
      A rule of type "a/%: a/%.in" will also match "a/b/%: a/b/%.in", so no
      need for the explicit examples/hooks rule. As for the man rules, they
      are identical and thus can be collapsed.
      
      We still have the problem that globally, not all our %.in to %
      transformations are identical; this is suboptimal and should be
      cleaned sometime…
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      55398706
    • Iustin Pop's avatar
      Explicitly terminate some make rules · 490bec02
      Iustin Pop authored
      Generic rules like:
      
        %: %.in
      
      have the downside that the source (%.in) itself matches the target
      (via %.in: %.in.in). This leads to things like:
      
        Looking for a rule with intermediate file `doc/examples/hooks/ipsec.in.in'.
         Trying pattern rule with stem `ipsec.in.in'.
         Trying implicit prerequisite `doc/examples/hooks/ipsec.in.in.in'.
         Trying pattern rule with stem `ipsec.in.in'.
         Trying implicit prerequisite `doc/examples/hooks/ipsec.in.in.in'.
         Looking for a rule with intermediate file `doc/examples/hooks/ipsec.in.in.in'.
        Rejecting impossible implicit prerequisite `doc/examples/hooks/ipsec.in.in'.
      
      To fix this, we need to tell make that such rules are terminating, so
      that it doesn't recurse into them.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      490bec02
    • Iustin Pop's avatar
      Remove ancient implicit make rules · 1d45f7a0
      Iustin Pop authored
      GNU Make contains some (ancient) implicit rules, that try to
      _automatically_ extract source files from RCS/SCCS version control
      systems. This is unneeded, and it pollutes the make -d output
      significantly: after removing these rules (by defining empty targets
      for their patterns), make -d line count goes from 5.3K to 3.3K.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      1d45f7a0
    • Iustin Pop's avatar
      Stop using BUILT_SOURCES · 4c3d5fb6
      Iustin Pop authored
      Commit dc7d2c49 introduced the use of BUILT_SOURCES to work around
      missing dependencies. However, on closer reading of the gmake manual,
      BUILT_SOURCES is mainly used in cases where the dependencies are not
      know before the build starts (e.g. with auto-generated C header
      files). Additionally, there are a number of drawbacks to
      BUILT_SOURCES, which we already had to work around (e.g. in commit
      eb732fb5).
      
      Since we know all our dependencies statically, there's no need to use
      this special variable. Let's rename it to GENERATED_FILES, which
      doesn't have a special meaning to make, and add a few missing
      dependencies (one of which was already broken by make -j on a clean
      tree).
      
      After this change, running make in a fully built tree is finally "clean":
      
        $ make
        make: Nothing to be done for `all'.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      4c3d5fb6
    • Iustin Pop's avatar
      Change how we create the 'ganeti' symlink · 924ecd85
      Iustin Pop authored
      Currently, if one runs 'make' in an already fully-built tree, this is
      the result:
      
        cd . && test -h "ganeti" || { rm -f ganeti && ln -s lib ganeti; }
        make  all-am
        make[1]: Entering directory `/tmp/test'
        cd . && test -h "ganeti" || { rm -f ganeti && ln -s lib ganeti; }
        make[1]: Leaving directory `/tmp/test'
      
      This is because commit dc7d2c49 added 'ganeti' (which is a PHONY
      target) to BUILT_SOURCES, and since that is a dependency of other,
      real targets, it means the ganeti target is always remade.
      
      To fix this, we keep ganeti as a PHONY target, but we remove it from
      the 'built_base_sources' target, and instead we only remake it
      manually in the stamp-directories target. A make run now is just:
      
        make  all-am
        make[1]: Entering directory `/tmp/test'
        make[1]: Nothing to be done for `all-am'.
        make[1]: Leaving directory `/tmp/test'
      
      Note that we can't get rid of the all-am since we use BUILT_SOURCES.
      
      We also remove the comment of BUILT_SOURCES since it no longer depends
      on PHONY targets.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      924ecd85
    • Iustin Pop's avatar
      Partial undo of "Makefile: Streamline directory creation" · 3735787e
      Iustin Pop authored
      Commit c964d962 changed the way we create directories, by two things:
      
      - unifying all dependencies and ad-hoc directory creation into a
        single target (all_dirfiles)
      - changing how directories are created from a stamp file to .dir files
        in each directory
      
      The first item is a very good one, but the second item is debatable:
      there's no per-se advantage of .dir files versus a single one,
      top-level, since both the .dir file and stamp-directories creation are
      depending on Makefile, which is the only one which can introduce new
      directories.
      
      On the other hand, moving back from .dir files to stamp-directories
      has an advantage: "make -d | wc -l" does from ~8.7K lines to ~5.3K
      lines, because we eliminate the many .dir files and their multiple
      implicit and explicit dependencies (the %/.dir files fall under
      multiple patterns).
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      3735787e
    • Iustin Pop's avatar
      A few style fixes in Makefile.am · 5098afd1
      Iustin Pop authored
      Seen while debugging make rules.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      5098afd1
  3. 20 Jul, 2012 3 commits
  4. 19 Jul, 2012 21 commits
  5. 18 Jul, 2012 3 commits