From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2009 06:10:08 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8cc62c1677c99c5e204d2b51269b47b7557a79e0?hp=-c

Merge branch 'maint'

* maint:
Makefile: add compat/bswap.h to LIB_H
---

8cc62c1677c99c5e204d2b51269b47b7557a79e0
diff --combined Makefile
index 15ea32d394,3bca8d42cc..5d5976f94f
--- a/Makefile
+++ b/Makefile
@@@ -159,10 -159,6 +159,10 @@@ all:
  # Define ASCIIDOC_NO_ROFF if your DocBook XSL escapes raw roff directives
  # (versions 1.72 and later and 1.68.1 and earlier).
  #
 +# Define GNU_ROFF if your target system uses GNU groff.  This forces
 +# apostrophes to be ASCII so that cut&pasting examples to the shell
 +# will work.
 +#
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
@@@ -416,6 -412,7 +416,7 @@@ LIB_H += builtin.
  LIB_H += cache.h
  LIB_H += cache-tree.h
  LIB_H += commit.h
+ LIB_H += compat/bswap.h
  LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += csum-file.h
@@@ -456,7 -453,6 +457,7 @@@ LIB_H += sideband.
  LIB_H += sigchain.h
  LIB_H += strbuf.h
  LIB_H += string-list.h
 +LIB_H += submodule.h
  LIB_H += tag.h
  LIB_H += transport.h
  LIB_H += tree.h
@@@ -555,7 -551,6 +556,7 @@@ LIB_OBJS += sideband.
  LIB_OBJS += sigchain.o
  LIB_OBJS += strbuf.o
  LIB_OBJS += string-list.o
 +LIB_OBJS += submodule.o
  LIB_OBJS += symlinks.o
  LIB_OBJS += tag.o
  LIB_OBJS += trace.o